diff --git a/android/ipc-tester.c b/android/ipc-tester.c
index c2013f7..9b6c8bb 100644
--- a/android/ipc-tester.c
+++ b/android/ipc-tester.c
@@ -1355,32 +1355,38 @@ int main(int argc, char *argv[])
 			sizeof(struct hal_cmd_hf_client_disconnect_audio), -1,
 			HAL_SERVICE_ID_BLUETOOTH,
 			HAL_SERVICE_ID_HANDSFREE_CLIENT);
-	test_datasize_valid("HF_CLIENT Start VR+", HAL_SERVICE_ID_BLUETOOTH,
+	test_datasize_valid("HF_CLIENT Start VR+",
+			HAL_SERVICE_ID_HANDSFREE_CLIENT,
 			HAL_OP_HF_CLIENT_START_VR,
 			0, 1,
 			HAL_SERVICE_ID_BLUETOOTH,
 			HAL_SERVICE_ID_HANDSFREE_CLIENT);
-	test_datasize_valid("HF_CLIENT Start VR-", HAL_SERVICE_ID_BLUETOOTH,
+	test_datasize_valid("HF_CLIENT Start VR-",
+			HAL_SERVICE_ID_HANDSFREE_CLIENT,
 			HAL_OP_HF_CLIENT_START_VR,
 			0, -1,
 			HAL_SERVICE_ID_BLUETOOTH,
 			HAL_SERVICE_ID_HANDSFREE_CLIENT);
-	test_datasize_valid("HF_CLIENT Stop VR+", HAL_SERVICE_ID_BLUETOOTH,
+	test_datasize_valid("HF_CLIENT Stop VR+",
+			HAL_SERVICE_ID_HANDSFREE_CLIENT,
 			HAL_OP_HF_CLIENT_STOP_VR,
 			0, 1,
 			HAL_SERVICE_ID_BLUETOOTH,
 			HAL_SERVICE_ID_HANDSFREE_CLIENT);
-	test_datasize_valid("HF_CLIENT Stop VR-", HAL_SERVICE_ID_BLUETOOTH,
+	test_datasize_valid("HF_CLIENT Stop VR-",
+			HAL_SERVICE_ID_HANDSFREE_CLIENT,
 			HAL_OP_HF_CLIENT_STOP_VR,
 			0, -1,
 			HAL_SERVICE_ID_BLUETOOTH,
 			HAL_SERVICE_ID_HANDSFREE_CLIENT);
-	test_datasize_valid("HF_CLIENT Vol Contr.+", HAL_SERVICE_ID_BLUETOOTH,
+	test_datasize_valid("HF_CLIENT Vol Contr.+",
+			HAL_SERVICE_ID_HANDSFREE_CLIENT,
 			HAL_OP_HF_CLIENT_VOLUME_CONTROL,
 			sizeof(struct hal_cmd_hf_client_volume_control), 1,
 			HAL_SERVICE_ID_BLUETOOTH,
 			HAL_SERVICE_ID_HANDSFREE_CLIENT);
-	test_datasize_valid("HF_CLIENT Vol Contr.-", HAL_SERVICE_ID_BLUETOOTH,
+	test_datasize_valid("HF_CLIENT Vol Contr.-",
+			HAL_SERVICE_ID_HANDSFREE_CLIENT,
 			HAL_OP_HF_CLIENT_VOLUME_CONTROL,
 			sizeof(struct hal_cmd_hf_client_volume_control), -1,
 			HAL_SERVICE_ID_BLUETOOTH,
@@ -1401,22 +1407,26 @@ int main(int argc, char *argv[])
 				sizeof(hfp_number)),
 			HAL_SERVICE_ID_BLUETOOTH,
 			HAL_SERVICE_ID_HANDSFREE_CLIENT);
-	test_datasize_valid("HF_CLIENT Dial Memory+", HAL_SERVICE_ID_BLUETOOTH,
+	test_datasize_valid("HF_CLIENT Dial Memory+",
+			HAL_SERVICE_ID_HANDSFREE_CLIENT,
 			HAL_OP_HF_CLIENT_DIAL_MEMORY,
 			sizeof(struct hal_cmd_hf_client_dial_memory), 1,
 			HAL_SERVICE_ID_BLUETOOTH,
 			HAL_SERVICE_ID_HANDSFREE_CLIENT);
-	test_datasize_valid("HF_CLIENT Dial Memory-", HAL_SERVICE_ID_BLUETOOTH,
+	test_datasize_valid("HF_CLIENT Dial Memory-",
+			HAL_SERVICE_ID_HANDSFREE_CLIENT,
 			HAL_OP_HF_CLIENT_DIAL_MEMORY,
 			sizeof(struct hal_cmd_hf_client_dial_memory), -1,
 			HAL_SERVICE_ID_BLUETOOTH,
 			HAL_SERVICE_ID_HANDSFREE_CLIENT);
-	test_datasize_valid("HF_CLIENT Call Action+", HAL_SERVICE_ID_BLUETOOTH,
+	test_datasize_valid("HF_CLIENT Call Action+",
+			HAL_SERVICE_ID_HANDSFREE_CLIENT,
 			HAL_OP_HF_CLIENT_CALL_ACTION,
 			sizeof(struct hal_cmd_hf_client_call_action), 1,
 			HAL_SERVICE_ID_BLUETOOTH,
 			HAL_SERVICE_ID_HANDSFREE_CLIENT);
-	test_datasize_valid("HF_CLIENT Call Action-", HAL_SERVICE_ID_BLUETOOTH,
+	test_datasize_valid("HF_CLIENT Call Action-",
+			HAL_SERVICE_ID_HANDSFREE_CLIENT,
 			HAL_OP_HF_CLIENT_CALL_ACTION,
 			sizeof(struct hal_cmd_hf_client_call_action), -1,
 			HAL_SERVICE_ID_BLUETOOTH,
@@ -1428,55 +1438,55 @@ int main(int argc, char *argv[])
 			HAL_SERVICE_ID_BLUETOOTH,
 			HAL_SERVICE_ID_HANDSFREE_CLIENT);
 	test_datasize_valid("HF_CLIENT Query Current Calls-",
-			HAL_SERVICE_ID_BLUETOOTH,
+			HAL_SERVICE_ID_HANDSFREE_CLIENT,
 			HAL_OP_HF_CLIENT_QUERY_CURRENT_CALLS,
 			0, -1,
 			HAL_SERVICE_ID_BLUETOOTH,
 			HAL_SERVICE_ID_HANDSFREE_CLIENT);
 	test_datasize_valid("HF_CLIENT Query Operator Name+",
-			HAL_SERVICE_ID_BLUETOOTH,
+			HAL_SERVICE_ID_HANDSFREE_CLIENT,
 			HAL_OP_HF_CLIENT_QUERY_OPERATOR_NAME,
 			0, 1,
 			HAL_SERVICE_ID_BLUETOOTH,
 			HAL_SERVICE_ID_HANDSFREE_CLIENT);
 	test_datasize_valid("HF_CLIENT Query Operator Name-",
-			HAL_SERVICE_ID_BLUETOOTH,
+			HAL_SERVICE_ID_HANDSFREE_CLIENT,
 			HAL_OP_HF_CLIENT_QUERY_OPERATOR_NAME,
 			0, -1,
 			HAL_SERVICE_ID_BLUETOOTH,
 			HAL_SERVICE_ID_HANDSFREE_CLIENT);
 	test_datasize_valid("HF_CLIENT Retrieve Subscrb. Info+",
-			HAL_SERVICE_ID_BLUETOOTH,
+			HAL_SERVICE_ID_HANDSFREE_CLIENT,
 			HAL_OP_HF_CLIENT_RETRIEVE_SUBSCR_INFO,
 			0, 1,
 			HAL_SERVICE_ID_BLUETOOTH,
 			HAL_SERVICE_ID_HANDSFREE_CLIENT);
 	test_datasize_valid("HF_CLIENT Retrieve Subscrb. Info-",
-			HAL_SERVICE_ID_BLUETOOTH,
+			HAL_SERVICE_ID_HANDSFREE_CLIENT,
 			HAL_OP_HF_CLIENT_RETRIEVE_SUBSCR_INFO,
 			0, -1,
 			HAL_SERVICE_ID_BLUETOOTH,
 			HAL_SERVICE_ID_HANDSFREE_CLIENT);
 	test_datasize_valid("HF_CLIENT Send DTMF+",
-			HAL_SERVICE_ID_BLUETOOTH,
+			HAL_SERVICE_ID_HANDSFREE_CLIENT,
 			HAL_OP_HF_CLIENT_SEND_DTMF,
 			sizeof(struct hal_cmd_hf_client_send_dtmf), 1,
 			HAL_SERVICE_ID_BLUETOOTH,
 			HAL_SERVICE_ID_HANDSFREE_CLIENT);
 	test_datasize_valid("HF_CLIENT Send DTMF-",
-			HAL_SERVICE_ID_BLUETOOTH,
+			HAL_SERVICE_ID_HANDSFREE_CLIENT,
 			HAL_OP_HF_CLIENT_SEND_DTMF,
 			sizeof(struct hal_cmd_hf_client_send_dtmf), -1,
 			HAL_SERVICE_ID_BLUETOOTH,
 			HAL_SERVICE_ID_HANDSFREE_CLIENT);
 	test_datasize_valid("HF_CLIENT Get Last Voice Tag+",
-			HAL_SERVICE_ID_BLUETOOTH,
+			HAL_SERVICE_ID_HANDSFREE_CLIENT,
 			HAL_OP_HF_CLIENT_GET_LAST_VOICE_TAG_NUM,
 			0, 1,
 			HAL_SERVICE_ID_BLUETOOTH,
 			HAL_SERVICE_ID_HANDSFREE_CLIENT);
 	test_datasize_valid("HF_CLIENT Get Last Voice Tag-",
-			HAL_SERVICE_ID_BLUETOOTH,
+			HAL_SERVICE_ID_HANDSFREE_CLIENT,
 			HAL_OP_HF_CLIENT_GET_LAST_VOICE_TAG_NUM,
 			0, -1,
 			HAL_SERVICE_ID_BLUETOOTH,