Change variable name for a proper one
Add device location as precondition and refactor test mocking SOS calls