Added date ranges and tests