Basic location correction [PD-745]

I'm currently working on making tests pass, but it's a test issue, not a view issue.
Is country short always going to be the first three characters? I thought we stored country_short as part of the model in the db?