Fix export Datetime => DateTime
Fix failing tests