fix test that depended on current year
Merge branch 'rm_production' into wip-open