add more dates; add tests