don't require both cell/wifi entries and use a better test location