Hopefully fixed last Datetime issue
More tests