Strict hours and days format

We refuse invalid hours and days like 24h, 0d or 32d.

I have also updated test data a little bit.
same on `$date2`