More passing tests and allow dynamic date generation for ISO