diff --git a/src/main/java/oryanmoshe/kafka/connect/util/TimestampConverter.java b/src/main/java/oryanmoshe/kafka/connect/util/TimestampConverter.java
index 8c87252..556aed5 100644
--- a/src/main/java/oryanmoshe/kafka/connect/util/TimestampConverter.java
+++ b/src/main/java/oryanmoshe/kafka/connect/util/TimestampConverter.java
@@ -2,26 +2,24 @@
 
 import io.debezium.spi.converter.CustomConverter;
 import io.debezium.spi.converter.RelationalColumn;
+import org.apache.kafka.connect.data.SchemaBuilder;
 
-import java.text.SimpleDateFormat;
 import java.time.Instant;
-import java.util.Date;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
-import java.util.TimeZone;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.kafka.connect.data.SchemaBuilder;
-
 public class TimestampConverter implements CustomConverter<SchemaBuilder, RelationalColumn> {
 
     private static final Map<String, String> MONTH_MAP = Map.ofEntries(Map.entry("jan", "01"), Map.entry("feb", "02"),
             Map.entry("mar", "03"), Map.entry("apr", "04"), Map.entry("may", "05"), Map.entry("jun", "06"),
             Map.entry("jul", "07"), Map.entry("aug", "08"), Map.entry("sep", "09"), Map.entry("oct", "10"),
             Map.entry("nov", "11"), Map.entry("dec", "12"));
-    public static final int MILLIS_LENGTH = 13;
 
     public static final String DEFAULT_DATETIME_FORMAT = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'";
     public static final String DEFAULT_DATE_FORMAT = "YYYY-MM-dd";
@@ -30,36 +28,35 @@ public class TimestampConverter implements CustomConverter<SchemaBuilder, Relati
     public static final List<String> SUPPORTED_DATA_TYPES = List.of("date", "time", "datetime", "timestamp",
             "datetime2");
 
-    private static final String DATETIME_REGEX = "(?<datetime>(?<date>(?:(?<year>\\d{4})-(?<month>\\d{1,2})-(?<day>\\d{1,2}))|(?:(?<day2>\\d{1,2})\\/(?<month2>\\d{1,2})\\/(?<year2>\\d{4}))|(?:(?<day3>\\d{1,2})-(?<month3>\\w{3})-(?<year3>\\d{4})))?(?:\\s?T?(?<time>(?<hour>\\d{1,2}):(?<minute>\\d{1,2}):(?<second>\\d{1,2})\\.?(?<milli>\\d{0,7})?)?))";
-    private static final Pattern regexPattern = Pattern.compile(DATETIME_REGEX);
+    private static final Pattern dateTimeRegex = Pattern.compile("(?<datetime>(?<date>(?:(?<year>\\d{4})-(?<month>\\d{1,2})-(?<day>\\d{1,2}))|(?:(?<day2>\\d{1,2})\\/(?<month2>\\d{1,2})\\/(?<year2>\\d{4}))|(?:(?<day3>\\d{1,2})-(?<month3>\\w{3})-(?<year3>\\d{4})))?(?:\\s?T?(?<time>(?<hour>\\d{1,2}):(?<minute>\\d{1,2}):(?<second>\\d{1,2})\\.?(?<milli>\\d{0,7})?)?))");
+    private static final Pattern numberRegex = Pattern.compile("\\d+");
 
-    public String strDatetimeFormat, strDateFormat, strTimeFormat;
     public Boolean debug;
 
-//    private final SchemaBuilder datetimeSchema = SchemaBuilder.string().optional().name("oryanmoshe.time.DateTimeString");
+    private DateTimeFormatter dateTimeFormatter;
+    private DateTimeFormatter dateFormatter;
+    private DateTimeFormatter timeFormatter;
 
-    private SimpleDateFormat simpleDatetimeFormatter, simpleDateFormatter, simpleTimeFormatter;
+    private String dateTimePattern, datePattern, timePattern;
 
     @Override
     public void configure(Properties props) {
-        this.strDatetimeFormat = props.getProperty("format.datetime", DEFAULT_DATETIME_FORMAT);
-        this.simpleDatetimeFormatter = new SimpleDateFormat(this.strDatetimeFormat);
+        this.dateTimePattern = props.getProperty("format.datetime", DEFAULT_DATETIME_FORMAT);
+        this.dateTimeFormatter = DateTimeFormatter.ofPattern(this.dateTimePattern).withZone(ZoneOffset.UTC);
 
-        this.strDateFormat = props.getProperty("format.date", DEFAULT_DATE_FORMAT);
-        this.simpleDateFormatter = new SimpleDateFormat(this.strDateFormat);
+        this.datePattern = props.getProperty("format.date", DEFAULT_DATE_FORMAT);
+        this.dateFormatter = DateTimeFormatter.ofPattern(this.datePattern).withZone(ZoneOffset.UTC);
 
-        this.strTimeFormat = props.getProperty("format.time", DEFAULT_TIME_FORMAT);
-        this.simpleTimeFormatter = new SimpleDateFormat(this.strTimeFormat);
+        this.timePattern = props.getProperty("format.time", DEFAULT_TIME_FORMAT);
+        this.timeFormatter = DateTimeFormatter.ofPattern(this.timePattern).withZone(ZoneOffset.UTC);
 
         this.debug = props.getProperty("debug", "false").equals("true");
 
-        this.simpleDatetimeFormatter.setTimeZone(TimeZone.getTimeZone("UTC"));
-        this.simpleTimeFormatter.setTimeZone(TimeZone.getTimeZone("UTC"));
-
-        if (this.debug)
+        if (this.debug) {
             System.out.printf(
-                    "[TimestampConverter.configure] Finished configuring formats. this.strDatetimeFormat: %s, this.strTimeFormat: %s%n",
-                    this.strDatetimeFormat, this.strTimeFormat);
+                    "[TimestampConverter.configure] dateTimeFormatter: %s, dateFormatter: %s, timeFormatter: %s%n",
+                    dateTimeFormatter, dateFormatter, timeFormatter);
+        }
     }
 
     @Override
@@ -69,70 +66,107 @@ public void converterFor(RelationalColumn column, ConverterRegistration<SchemaBu
                     "[TimestampConverter.converterFor] Starting to register column. column.name: %s, column.typeName: %s, column.hasDefaultValue: %s, column.defaultValue: %s, column.isOptional: %s%n",
                     column.name(), column.typeName(), column.hasDefaultValue(), column.defaultValue(), column.isOptional());
         if (SUPPORTED_DATA_TYPES.stream().anyMatch(s -> s.equalsIgnoreCase(column.typeName()))) {
+            // NOTE SUPPORTED_DATA_TYPES decides which types will get converted. We could augment the logic
+            // here to just look for a list of column names e.g. "inserted_at", "updated_at", etc
+
             boolean isTime = "time".equalsIgnoreCase(column.typeName());
             // Use a new SchemaBuilder every time in order to avoid changing "Already set" options
             // in the schema builder between tables.
-            registration.register(SchemaBuilder.string().optional(), rawValue -> {
+
+            // Building the schema for the payload
+            final SchemaBuilder builder = column.isOptional() ? SchemaBuilder.string().optional() : SchemaBuilder.string().required();
+            registration.register(builder, rawValue -> {
                 if (rawValue == null) {
-                    // DEBUG
-                    if (this.debug) {
-                        System.out.printf("[TimestampConverter.converterFor] rawValue of %s is null.%n", column.name());
-                    }
+                    if (this.debug) { System.out.printf("[TimestampConverter.converterFor] rawValue of %s is null.%n", column.name()); }
+                    return fallback(column);
+                }
+                if (rawValue instanceof String){
+                    final String value = (String)rawValue;
 
-                    if (column.isOptional()) {
-                        return null;
+                    if (this.debug) { System.out.println("[TimestampConverter.converterFor] value: " + value); }
+                    final Instant instant;
+                    if (isIsoString(value)) {
+                        instant = parseIsoString(value);
                     }
-                    else if (column.hasDefaultValue()) {
-                        return column.defaultValue();
+                    else if (isTime) {
+                        instant = parseTime(value);
+                    }
+                    else {
+                        instant = parseEpoch(value);
+                    }
+                    if (instant == null) { return rawValue.toString(); }
+                    if (this.debug) { System.out.println("[TimestampConverter.converterFor] instant: " + instant); }
+                    if (this.debug) {
+                        System.out.printf(
+                                "[TimestampConverter.converterFor] Before returning conversion. column.name: %s, column.typeName: %s%n",
+                                column.name(), column.typeName());
+                    }
+                    switch (column.typeName().toLowerCase()) {
+                        case "time":
+                            if (this.debug) { System.out.println("Using timeFormatter"); }
+                            return this.timeFormatter.format(instant);
+                        case "date":
+                            if (this.debug) { System.out.println("Using dateFormatter"); }
+                            return this.dateFormatter.format(instant);
+                        default:
+                            if (this.debug) { System.out.println("Using dateTimeFormatter"); }
+                            return this.dateTimeFormatter.format(instant);
                     }
-                    return rawValue;
-                }
-
-                Long millis = getMillis(rawValue.toString(), isTime);
-                if (millis == null)
-                    return rawValue.toString();
-
-                Instant instant = Instant.ofEpochMilli(millis);
-                Date dateObject = Date.from(instant);
-                if (this.debug)
-                    System.out.printf(
-                            "[TimestampConverter.converterFor] Before returning conversion. column.name: %s, column.typeName: %s, millis: %d%n",
-                            column.name(), column.typeName(), millis);
-                switch (column.typeName().toLowerCase()) {
-                    case "time":
-                        return this.simpleTimeFormatter.format(dateObject);
-                    case "date":
-                        return this.simpleDateFormatter.format(dateObject);
-                    default:
-                        return this.simpleDatetimeFormatter.format(dateObject);
                 }
+                if (this.debug) { System.out.printf("[TimestampConverter.converterFor] rawValue of %s is not a String.%n", column.name()); }
+                return fallback(column);
             });
         }
     }
 
-    private Long getMillis(String timestamp, boolean isTime) {
-        if (timestamp.isBlank())
-            return null;
+    private Object fallback(final RelationalColumn column) {
+        if (column.isOptional()) { return null; }
+        else if (column.hasDefaultValue()) { return column.defaultValue(); }
+        return  null;
+    }
 
-        if (timestamp.contains(":") || timestamp.contains("-")) {
-            return milliFromDateString(timestamp);
-        }
+    private Instant parseTime(final String timestamp) {
+        long epoch = Long.parseLong(timestamp.replaceAll("\\D+",""));
+        // FIXME: This does not support microseconds.
+        return Instant.ofEpochMilli(epoch);
+    }
 
-        int excessLength = timestamp.length() - MILLIS_LENGTH;
-        long longTimestamp = Long.parseLong(timestamp);
+    private Instant parseEpoch(final String datetime) {
+        if (this.debug) {
+            System.out.printf("[TimestampConverter.parseToEpoch] %-7s: %-8s%n", "Before", datetime);
+        }
+        if (datetime == null || datetime.isBlank() || !isEpoch(datetime)) { return null; }
+        if (this.debug) {
+            System.out.printf("[TimestampConverter.parseToEpoch] %-7s: %-8d%n", "After!", Long.parseLong(datetime));
+        }
+        long epoch = Long.parseLong(datetime);
+        if (datetime.length() < 6) {
+            return Instant.EPOCH.plus(epoch, ChronoUnit.DAYS);
+        }
+        else if (datetime.length() < 14) {
+            return Instant.EPOCH.plus(epoch, ChronoUnit.MILLIS);
+        }
+        return Instant.EPOCH.plus(epoch, ChronoUnit.MICROS);
+    }
 
-        if (isTime)
-            return longTimestamp;
+    private Instant parseIsoString(final String isoString) {
+        final String  normalized = normalizeIso(isoString);
+        if (normalized == null) {
+            return null;
+        }
+        return Instant.parse(normalized);
+    }
 
-        if (excessLength < 0)
-            return longTimestamp * 24 * 60 * 60 * 1000;
+    private boolean isEpoch(final String timestamp) {
+        return numberRegex.matcher(timestamp).matches();
+    }
 
-        long millis = longTimestamp / (long) Math.pow(10, excessLength);
-        return millis;
+    private boolean isIsoString(final String timestamp) {
+        return (timestamp.contains(":") || timestamp.contains("-"));
     }
 
-    private Long milliFromDateString(String timestamp) {
-        Matcher matches = regexPattern.matcher(timestamp);
+    private String normalizeIso(final String string) {
+        final Matcher matches = dateTimeRegex.matcher(string);
 
         if (matches.find()) {
             String year = (matches.group("year") != null ? matches.group("year")
@@ -146,28 +180,22 @@ private Long milliFromDateString(String timestamp) {
             String second = matches.group("second") != null ? matches.group("second") : "00";
             String milli = matches.group("milli") != null ? matches.group("milli") : "000";
 
-            if (milli.length() > 3)
-                milli = milli.substring(0, 3);
-
-            String dateStr = "";
-            dateStr += String.format("%s:%s:%s.%s", ("00".substring(hour.length()) + hour),
+            final StringBuilder isoDateString = new StringBuilder();
+            isoDateString.append(String.format("%s:%s:%s.%s", ("00".substring(hour.length()) + hour),
                     ("00".substring(minute.length()) + minute), ("00".substring(second.length()) + second),
-                    (milli + "000".substring(milli.length())));
+                    (milli + "000000".substring(milli.length()))));
 
             if (year != null) {
                 if (month.length() > 2)
                     month = MONTH_MAP.get(month.toLowerCase());
 
-                dateStr = String.format("%s-%s-%sT%sZ", year, ("00".substring(month.length()) + month),
-                        ("00".substring(day.length()) + day), dateStr);
+                return new StringBuilder(String.format("%s-%s-%sT%sZ", year, ("00".substring(month.length()) + month),
+                        ("00".substring(day.length()) + day), isoDateString)).toString();
+
             } else {
-                dateStr = String.format("%s-%s-%sT%sZ", "2020", "01", "01", dateStr);
+                return new StringBuilder(String.format("%s-%s-%sT%sZ", "2020", "01", "01", isoDateString)).toString();
             }
-
-            Date dateObj = Date.from(Instant.parse(dateStr));
-            return dateObj.getTime();
         }
-
         return null;
     }
 }
diff --git a/src/test/java/oryanmoshe/kafka/connect/util/TimestampConverterTests.java b/src/test/java/oryanmoshe/kafka/connect/util/TimestampConverterTests.java
index 5a01f37..e45ed5f 100644
--- a/src/test/java/oryanmoshe/kafka/connect/util/TimestampConverterTests.java
+++ b/src/test/java/oryanmoshe/kafka/connect/util/TimestampConverterTests.java
@@ -1,6 +1,7 @@
 package oryanmoshe.kafka.connect.util;
 
 import org.apache.kafka.connect.data.SchemaBuilder;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
 
@@ -8,12 +9,13 @@
 import io.debezium.spi.converter.CustomConverter.Converter;
 import io.debezium.spi.converter.CustomConverter.ConverterRegistration;
 
+import java.util.Map;
 import java.util.OptionalInt;
 import java.util.Properties;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class TimestampConverterTests {
-    private class MockRegistration<S> implements ConverterRegistration<S> {
+    private static class MockRegistration<S> implements ConverterRegistration<S> {
         public Converter _converter;
         public S _schema;
 
@@ -24,61 +26,190 @@ public void register(S fieldSchema, Converter converter) {
         }
     }
 
-    @ParameterizedTest
-    @CsvSource({ "YY-MM-dd, YY-MM-dd", "," + TimestampConverter.DEFAULT_DATE_FORMAT })
-    void configureDateTest(final String inputFormat, final String expectedFormat) {
+    @Test
+    void converterDateTimeStampTest() {
+        final String columnType = "timestamp";
+        final String format = "yyyy-MM-dd HH:mm:ss.SSSSSS";
+        final String input = "1637208584795307";
+
+        final String expectedResult = "2021-11-18 04:09:44.795307";
+
+        final Properties props = new Properties();
+        props.putAll(Map.of(String.format("format.%s", "datetime"),format, "debug", "true"));
+
         final TimestampConverter tsConverter = new TimestampConverter();
+        tsConverter.configure(props);
 
-        Properties props = new Properties();
-        if (inputFormat != null)
-            props.put("format.date", inputFormat);
+        final RelationalColumn mockColumn = getMockColumn(columnType);
+        final MockRegistration<SchemaBuilder> mockRegistration = new MockRegistration<>();
+
+        tsConverter.converterFor(mockColumn, mockRegistration);
+
+        final Object actualResult = mockRegistration._converter.convert(input);
+
+        assertEquals(expectedResult, actualResult);
 
-        final String beforeConfig = tsConverter.strDateFormat;
-        assertEquals(null, beforeConfig, beforeConfig + " before configuration, should equal " + null);
-        System.out.println(beforeConfig);
 
+        // Convert reverse
+        final String columnType2 = "datetime";
+        final RelationalColumn mockColumn2 = getMockColumn(columnType2);
+        tsConverter.converterFor(mockColumn2, mockRegistration);
+
+        final Object actualResult2 = mockRegistration._converter.convert(expectedResult);
+
+        assertEquals(actualResult2, expectedResult);
+    }
+
+    @Test
+    void converterDate() {
+        final String columnType = "date";
+        final String format = "YYYY-MM-dd";
+        final String input = "18368";
+        final String expectedResult = "2020-04-16";
+
+        final Properties props = new Properties();
+        props.putAll(Map.of(String.format("format.%s", "datetime"),format, "debug", "true"));
+
+        final TimestampConverter tsConverter = new TimestampConverter();
         tsConverter.configure(props);
 
-        final String actualResult = tsConverter.strDateFormat;
-        assertEquals(expectedFormat, actualResult,
-                actualResult + " after configuration, should equal " + expectedFormat);
-        System.out.println(actualResult);
+        final RelationalColumn mockColumn = getMockColumn(columnType);
+        final MockRegistration<SchemaBuilder> mockRegistration = new MockRegistration<>();
+
+        tsConverter.converterFor(mockColumn, mockRegistration);
+
+        final Object actualResult = mockRegistration._converter.convert(input);
+
+        assertEquals(expectedResult, actualResult);
+
+
+        // Convert reverse
+        final String columnType2 = "datetime";
+        final RelationalColumn mockColumn2 = getMockColumn(columnType2);
+        tsConverter.converterFor(mockColumn2, mockRegistration);
+
+        final Object actualResult2 = mockRegistration._converter.convert(expectedResult);
+
+        assertEquals(actualResult2, expectedResult);
     }
 
-    @ParameterizedTest
-    @CsvSource({ "mm:ss.SSS, mm:ss.SSS", "," + TimestampConverter.DEFAULT_TIME_FORMAT })
-    void configureTimeTest(final String inputFormat, final String expectedFormat) {
+    @Test
+    void converterDate2() {
+        final String columnType = "datetime";
+        final String format = "YYYY-MM-dd";
+        final String input = "1587042000279";
+        final String expectedResult = "2020-04-16";
+
+        final Properties props = new Properties();
+        props.putAll(Map.of(String.format("format.%s", "datetime"),format, "debug", "true"));
+
         final TimestampConverter tsConverter = new TimestampConverter();
+        tsConverter.configure(props);
 
-        Properties props = new Properties();
-        if (inputFormat != null)
-            props.put("format.time", inputFormat);
+        final RelationalColumn mockColumn = getMockColumn(columnType);
+        final MockRegistration<SchemaBuilder> mockRegistration = new MockRegistration<>();
+
+        tsConverter.converterFor(mockColumn, mockRegistration);
+
+        final Object actualResult = mockRegistration._converter.convert(input);
+
+        assertEquals(expectedResult, actualResult);
+
+
+        // Convert reverse
+        final String columnType2 = "datetime";
+        final RelationalColumn mockColumn2 = getMockColumn(columnType2);
+        tsConverter.converterFor(mockColumn2, mockRegistration);
+
+        final Object actualResult2 = mockRegistration._converter.convert(expectedResult);
 
-        final String beforeConfig = tsConverter.strTimeFormat;
-        assertEquals(null, beforeConfig, beforeConfig + " before configuration, should equal " + null);
-        System.out.println(beforeConfig);
+        assertEquals(actualResult2, expectedResult);
+    }
+
+    @Test
+    void converterTime() {
+        final String columnType = "time";
+        final String format = "HH:mm:ss.SSS";
+        final String input = "2230";
+        final String expectedResult = "00:00:02.230";
+
+        final Properties props = new Properties();
+        props.putAll(Map.of(String.format("format.%s", columnType), format, "debug", "true"));
 
+        final TimestampConverter tsConverter = new TimestampConverter();
         tsConverter.configure(props);
 
-        final String actualResult = tsConverter.strTimeFormat;
-        assertEquals(expectedFormat, actualResult,
-                actualResult + " after configuration, should equal " + expectedFormat);
-        System.out.println(actualResult);
+        final RelationalColumn mockColumn = getMockColumn(columnType);
+        final MockRegistration<SchemaBuilder> mockRegistration = new MockRegistration<>();
+
+        tsConverter.converterFor(mockColumn, mockRegistration);
+
+        final Object actualResult = mockRegistration._converter.convert(input);
+
+        assertEquals(expectedResult, actualResult);
+
+        // Convert reverse
+        final RelationalColumn mockColumn2 = getMockColumn(columnType);
+        tsConverter.converterFor(mockColumn2, mockRegistration);
+
+        final Object actualResult2 = mockRegistration._converter.convert(expectedResult);
+
+        assertEquals(actualResult2, expectedResult);
+    }
+
+    @Test
+    void converterTime2() {
+        final String columnType = "time";
+        final String input = "15:13:20";
+        final String expectedResult = "15:13:20.000";
+
+        final Properties props = new Properties();
+        props.putAll(Map.of("debug", "true"));
+
+        final TimestampConverter tsConverter = new TimestampConverter();
+        tsConverter.configure(props);
+
+        final RelationalColumn mockColumn = getMockColumn(columnType);
+        final MockRegistration<SchemaBuilder> mockRegistration = new MockRegistration<>();
+
+        tsConverter.converterFor(mockColumn, mockRegistration);
+
+        final Object actualResult = mockRegistration._converter.convert(input);
+
+        assertEquals(expectedResult, actualResult);
+
+        // Convert reverse
+        final RelationalColumn mockColumn2 = getMockColumn(columnType);
+        tsConverter.converterFor(mockColumn2, mockRegistration);
+
+        final Object actualResult2 = mockRegistration._converter.convert(expectedResult);
+
+        assertEquals(actualResult2, expectedResult);
     }
 
     @ParameterizedTest
-    @CsvSource({ "date, YYYY-MM-dd, 18368, 2020-04-16", "date,, 18368, 2020-04-16", "time, mm:ss.SSS, 2230, 00:02.230",
-            "time,, 2230, 00:00:02.230", "datetime, YYYY-MM-dd, 1587042000279, 2020-04-16",
-            "datetime,, 1587042000279, 2020-04-16T13:00:00.279Z", "timestamp, YYYY-MM-dd, 1587042000279, 2020-04-16",
-            "datetime2,, 1587042000279, 2020-04-16T13:00:00.279Z", "datetime2, YYYY-MM-dd, 1587042000279, 2020-04-16",
-            "timestamp,, 1587042000279, 2020-04-16T13:00:00.279Z", "date, YYYY-MM-dd, 2019-04-19, 2019-04-19",
-            "datetime,, 2019-04-19 15:13:20.345123, 2019-04-19T15:13:20.345Z", "time,, 15:13:20, 15:13:20.000",
-            "time,HH:mm:ss, 15:13:20, 15:13:20", "timestamp,, 2019-04-19 15:13:20, 2019-04-19T15:13:20.000Z",
+    @CsvSource({ "date, YYYY-MM-dd, 18368, 2020-04-16",
+            "date,, 18368, 2020-04-16",
+            "time, mm:ss.SSS, 2230, 00:02.230",
+            "time,, 2230, 00:00:02.230",
+            "datetime, YYYY-MM-dd, 1587042000279, 2020-04-16",
+            "datetime,, 1587042000279, 2020-04-16T13:00:00.279Z",
+            "timestamp, YYYY-MM-dd, 1587042000279, 2020-04-16",
+            "datetime2,, 1587042000279, 2020-04-16T13:00:00.279Z",
+            "datetime2, YYYY-MM-dd, 1587042000279, 2020-04-16",
+            "timestamp,, 1587042000279, 2020-04-16T13:00:00.279Z",
+            "date, YYYY-MM-dd, 2019-04-19, 2019-04-19",
+            "datetime,, 2019-04-19 15:13:20.345123, 2019-04-19T15:13:20.345Z",
+            "time,, 15:13:20, 15:13:20.000",
+            "time,HH:mm:ss, 15:13:20, 15:13:20",
+            "timestamp,, 2019-04-19 15:13:20, 2019-04-19T15:13:20.000Z",
             "datetime,, 19-Apr-2019 15:13:20.345123, 2019-04-19T15:13:20.345Z",
             "datetime,, 19/04/2019 15:13:20.345123, 2019-04-19T15:13:20.345Z",
             "datetime,, 2019-4-19 15:13:20.345123, 2019-04-19T15:13:20.345Z",
             "datetime2,, 2019-4-19 15:13:20.345123, 2019-04-19T15:13:20.345Z",
-            "datetime,, 2019-4-19 3:1:0.345123, 2019-04-19T03:01:00.345Z", "datetime,YYYY-MM-dd,,", "timestamp,,,", "date,,,"})
+            "datetime,, 2019-4-19 3:1:0.345123, 2019-04-19T03:01:00.345Z",
+            "datetime,YYYY-MM-dd,,",
+            "timestamp,,,", "date,,,"})
     void converterTest(final String columnType, final String format, final String input, final String expectedResult) {
         final TimestampConverter tsConverter = new TimestampConverter();
 
@@ -92,24 +223,12 @@ void converterTest(final String columnType, final String format, final String in
         tsConverter.configure(props);
 
         RelationalColumn mockColumn = getMockColumn(columnType);
-        MockRegistration<SchemaBuilder> mockRegistration = new MockRegistration<SchemaBuilder>();
+        MockRegistration<SchemaBuilder> mockRegistration = new MockRegistration<>();
 
         tsConverter.converterFor(mockColumn, mockRegistration);
 
-        System.out.println(mockRegistration._schema.name());
-
         Object actualResult = mockRegistration._converter.convert(input);
-        System.out.println(actualResult);
-        if (actualResult == null) {
-            assertEquals(actualResult, null, String.format(
-                    "columnType: %s, format: %s, input: %s, actualTimeFormat: %s, actualDateFormat: %s, props: %s",
-                    columnType, format, input, tsConverter.strTimeFormat, tsConverter.strDateFormat, props));
-        } else {
-        assertEquals(expectedResult, actualResult,
-                String.format(
-                        "columnType: %s, format: %s, input: %s, actualTimeFormat: %s, actualDateFormat: %s, props: %s",
-                        columnType, format, input, tsConverter.strTimeFormat, tsConverter.strDateFormat, props));
-        }
+        if (actualResult != null) { assertEquals(expectedResult, actualResult); }
     }
 
     RelationalColumn getMockColumn(String type) {
@@ -154,7 +273,7 @@ public String typeExpression() {
 
             @Override
             public OptionalInt scale() {
-                return null;
+                return OptionalInt.empty();
             }
 
             @Override
@@ -164,7 +283,7 @@ public int nativeType() {
 
             @Override
             public OptionalInt length() {
-                return null;
+                return OptionalInt.empty();
             }
 
             @Override
@@ -214,7 +333,7 @@ public String typeExpression() {
 
             @Override
             public OptionalInt scale() {
-                return null;
+                return OptionalInt.empty();
             }
 
             @Override
@@ -224,7 +343,7 @@ public int nativeType() {
 
             @Override
             public OptionalInt length() {
-                return null;
+                return OptionalInt.empty();
             }
 
             @Override
@@ -274,7 +393,7 @@ public String typeExpression() {
 
             @Override
             public OptionalInt scale() {
-                return null;
+                return OptionalInt.empty();
             }
 
             @Override
@@ -284,7 +403,7 @@ public int nativeType() {
 
             @Override
             public OptionalInt length() {
-                return null;
+                return OptionalInt.empty();
             }
 
             @Override
@@ -334,7 +453,7 @@ public String typeExpression() {
 
             @Override
             public OptionalInt scale() {
-                return null;
+                return OptionalInt.empty();
             }
 
             @Override
@@ -344,7 +463,7 @@ public int nativeType() {
 
             @Override
             public OptionalInt length() {
-                return null;
+                return OptionalInt.empty();
             }
 
             @Override
@@ -394,7 +513,7 @@ public String typeExpression() {
 
             @Override
             public OptionalInt scale() {
-                return null;
+                return OptionalInt.empty();
             }
 
             @Override
@@ -404,7 +523,7 @@ public int nativeType() {
 
             @Override
             public OptionalInt length() {
-                return null;
+                return OptionalInt.empty();
             }
 
             @Override