Revert "Added new tests for location selection."

This reverts commit edab21bdb8ac8cb2403474f4120c4ae60d7ddc0b.