Fix failing tests cause by DST ala 8e1ff56a362c3a7bda05a85faedc6d516387e924