Cleaner fix for #298 and better datetime handling
Fixing issue with test running slow

Timestamp Date was using got out of sync with datetime