Refactored expanded date attributes including tests.