                 "country user should be nil")
         }
     }
+    
+    func testRemovePreviousLocationSame()
+    {
+        var firebaseCountryUser:FDatabaseCountriesItemUser?
+        let country:String = kCountry
+        
+        let removeExpectation:XCTestExpectation = expectation(
+            description:"remove user from country")
+        
+        createUserAtLocation
+        { [weak self] (session:MSession, firebase:FDatabase) in
+            
+            guard
+                
+                let userId:String = session.data?.userId
+                
+            else
+            {
+                return
+            }
+            
+            self?.getUser(
+                userId:userId,
+                country:country,
+                firebase:firebase)
+            { (countryUser:FDatabaseCountriesItemUser?) in
+                
+                firebaseCountryUser = countryUser
+                
+                removeExpectation.fulfill()
+            }
+        }
+        
+        waitForExpectations(timeout:kWaitExpectation)
+        { (error:Error?) in
+            
+            XCTAssertNotNil(
+                firebaseCountryUser,
+                "user should not be removed")
+        }
+    }
 }

        let firebase:FDatabase = FDatabase()
        
        createUser(session:session)
        { [weak self] in
            
            self?.addLocation(
                session:session,
                firebase:firebase)
            {
                completion(session, firebase)
            }
        }
    }
    


class TMSessionLocation:XCTestCase
{
    private let kUserId:String = "johnnyTest"
    private let kCountry:String = "bananaRepublic"
    private let kOtherCountry:String = "coffeeRepublic"
    private let kLatitude:Double = 1
    private let kLongitude:Double = 2
    private let kWaitExpectation:TimeInterval = 15
    
    //MARK: private
    
    private func createUser(session:MSession)
    {
        let sessionData:MSessionData = MSessionData(
            userId:kUserId,
            country:kCountry,
            status:DSession.Status.active)
        session.data = sessionData
    }
    
    private func addLocation(
