More work on the tests, restructured to take start and end date to determine the period.