Fix timezone issue with test
Fix some tests. Become more opinionated.