Overhaul of Date and DateTime parsing code. Updated with additional tests as well