This should fix timespan not being includes in id

The test now reflects the way that, for example, google analytics
collectors actually handle passing in timeSpan.