 
         // First a good one
         do {
-<<<<<<< HEAD
-            let req = "\(lamp.aid).\(lamp.lightbulb.brightness!.iid),\(lightsensor.aid).\(lightsensor.lightSensor.currentLight.iid),\(thermostat.aid).\(thermostat.thermostat.currentTemperature.iid)"
+            let req = "\(lamp.aid).\(lamp.lightbulb.brightness!.iid),\(lightsensor.aid).\(lightsensor.lightSensor.currentLightLevel.iid),\(thermostat.aid).\(thermostat.thermostat.currentTemperature.iid)"
             let response = application(MockContext(), HTTPRequest(uri: "/characteristics?id=\(req)"))
-=======
-            let req = "\(lamp.aid).\(lamp.lightbulb.brightness!.iid),\(lightsensor.aid).\(lightsensor.lightSensor.currentLightLevel.iid),\(thermostat.aid).\(thermostat.thermostat.currentTemperature.iid)"
-            let response = application(MockConnection(), MockRequest.get(path: "/characteristics?id=\(req)"))
->>>>>>> Updating test-suite
 
             XCTAssertEqual(response.status, .ok)
 

                    [
                        "aid": thermostat.aid,
                        "iid": thermostat.thermostat.targetHeatingCoolingState.iid,
                        "value": HAP.TargetHeatingCoolingState.auto.rawValue
                    ]
                ]
            ]

                    [
                        "aid": thermostat.aid,
                        "iid": thermostat.thermostat.targetHeatingCoolingState.iid,
                        "value": Enums.TargetHeatingCoolingState.off.rawValue,
                        "ev": true,
                        "authData": "string",
                        "remote": true
