Fix a broken test and replace datetime with timezone modules in date ops