Refactored Iso8601 usage and tests.