The += operator contained bugs. We now also do some tests on the Duration type at the beginning of the timeout test. Fixes #2581