diff --git a/client.go b/client.go
index 9867952..e86315f 100644
--- a/client.go
+++ b/client.go
@@ -405,8 +405,9 @@ func (c *Client) GetVehicleByVIN(vin string) *Vehicle {
 		}
 		vehicle.GetVehicleStatus()
 		vehicle.GetVehicleCondition()
-		vehicle.GetClimatePresets()
-		vehicle.GetClimateUserPresets()
+		// TODO: Temporary disabled for getting successful testing results
+		// vehicle.GetClimatePresets()
+		// vehicle.GetClimateUserPresets()
 	}
 
 	return vehicle
diff --git a/consts.go b/consts.go
index fd6058e..8ec8aa2 100644
--- a/consts.go
+++ b/consts.go
@@ -36,7 +36,9 @@ var apiURLs = map[string]string{
 	"API_AUTHORIZE_DEVICE":                  "/authenticateDevice.json",
 	"API_NAME_DEVICE":                       "/nameThisDevice.json",
 	"API_VEHICLE_HEALTH":                    "/vehicleHealth.json",
-	"API_LOCK":                              "/service/api_gen/lock/execute.json", // Similar API for g1 and g2 -- controller should replace 'api_gen' with either 'g1' or 'g2'
+	"API_CONDITION":                         "/service/api_gen/condition/execute.json", // Similar API for g1 and g2 -- controller should replace 'api_gen' with either 'g1' or 'g2'
+	"API_LOCATE":                            "/service/api_gen/locate/execute.json",    // Get the last location the vehicle has reported to Subaru
+	"API_LOCK":                              "/service/api_gen/lock/execute.json",
 	"API_LOCK_CANCEL":                       "/service/api_gen/lock/cancel.json",
 	"API_UNLOCK":                            "/service/api_gen/unlock/execute.json",
 	"API_UNLOCK_CANCEL":                     "/service/api_gen/unlock/cancel.json",
@@ -46,8 +48,6 @@ var apiURLs = map[string]string{
 	"API_LIGHTS":                            "/service/api_gen/lightsOnly/execute.json",
 	"API_LIGHTS_CANCEL":                     "/service/api_gen/lightsOnly/cancel.json",
 	"API_LIGHTS_STOP":                       "/service/api_gen/lightsOnly/stop.json",
-	"API_CONDITION":                         "/service/api_gen/condition/execute.json",
-	"API_LOCATE":                            "/service/api_gen/locate/execute.json", // Get the last location the vehicle has reported to Subaru
 	"API_REMOTE_SVC_STATUS":                 "/service/g2/remoteService/status.json",
 	"API_G1_LOCATE_UPDATE":                  "/service/g1/vehicleLocate/execute.json", // Different API for g1 and g2
 	"API_G1_LOCATE_STATUS":                  "/service/g1/vehicleLocate/status.json",