refactor test-date interface