updated pickLocation to work with all the tests.