WIP: fix tests failing due to datetime changes