Fix timezone related filter test failure

Should fix issue #384.

(Also includes my CLA).