feat($location): test $location enhancements from #6421 and fix them

This is temporary, just to run a travis build and hopefully make the patch easier to review.