date: better version of previous commit; + fix testsuite
to have it checked

2 files changed