Fix country/state array tests
Merge branch 'release/2.0' of github.com:easydigitaldownloads/Easy-Digital-Downloads into release/2.0