Use Hint instead of Test for more pretty laout

This makes the country/hint more visible across the board

Change-Id: Ibe81e62ca1392f7b40f83e0b53c5000f5b52f7ae