unit test fixes for year as string in dict
Merge branch 'master' into gold_update