Remove TimeRange from JSON generator.
Update expected values in JSON generator tests.