Added conversions for java.sql.Date and java.sql.Timestamp + tests