[michael] Quick refactor on test date to be less breakable