Working toward date time literals
Fix to test cases
Further refactoring of date expressions
Refactored to improve reuse