Shindere/adding test for country

@jzoldak 
Do not commit commented-out code.