Add Location update and tests