Limit year span and add tests. Remove unused var.