Add: support for DateTime
Remove: tests