APOLLO-2645 Cleanup of dateFormatter and codeCoverage of new method