Fixed country codes

Bosnia: BH -> BA
Egypt: RE -> EG
Minor test bugfix