Extended test data to include Country data for improved testing - and
fixed bugs thrown up in improved testing!