Simplify tests that use date math