Added test for on Battery, then use GPS or NETWORK for location