Added DateTime handeling improvements
Extended datetime changes and updated tests to reflect datetime changes
Merge commit 'c4a3926c2ae3e15d67280f5667bb8760531be1d3'