To issues #446, #493 for countries with unit tests fixed