Better test naming in Bambo
Updated country codes - Restructured arrays

Fixes #451