It seems that the integration tests that I thought were covering this
had the same time. Added an assertion to the unit tests as well

Fixes #2863.

(cherry picked from commit 9dfa3abba293488a9a1899832a340f7b44525cad)