Added some tests and country filters