Fix tests. Move activation of users/locations to update method