Amend tests to use locations that are not countries
Improvements for readability