More date fixes; tests now all pass again and should be less date sensitive