Refactor a few helper methods out of the LocationTest
Merge branch 'master' into ice-cube