Fix tests to account for new granularities.