More date support and tests