diff --git a/android/tester-gatt.c b/android/tester-gatt.c
index 85f22bb..13e096f 100644
--- a/android/tester-gatt.c
+++ b/android/tester-gatt.c
@@ -1967,12 +1967,10 @@ static struct test_case test_cases[] = {
 		ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
 		ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
 		CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
-		ACTION_SUCCESS(gatt_client_start_scan_action,
-							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
 		CALLBACK_DEVICE_FOUND(prop_emu_remotes_default_le_set, 2),
 		CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
-		ACTION_SUCCESS(gatt_client_stop_scan_action,
-							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
 		ACTION_SUCCESS(bluetooth_disable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_OFF),
 	),
@@ -1984,12 +1982,10 @@ static struct test_case test_cases[] = {
 		ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
 		ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
 		CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
-		ACTION_SUCCESS(gatt_client_start_scan_action,
-							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
 		CALLBACK_DEVICE_FOUND(prop_emu_remotes_default_le_set, 2),
 		CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
-		ACTION_SUCCESS(gatt_client_stop_scan_action,
-							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
 		ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
 		CALLBACK_GATTC_CONNECT(GATT_STATUS_SUCCESS,
 						prop_emu_remotes_default_set,
@@ -2005,12 +2001,10 @@ static struct test_case test_cases[] = {
 		ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
 		ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
 		CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
-		ACTION_SUCCESS(gatt_client_start_scan_action,
-							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
 		CALLBACK_DEVICE_FOUND(prop_emu_remotes_default_le_set, 2),
 		CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
-		ACTION_SUCCESS(gatt_client_stop_scan_action,
-							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
 		ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
 		CALLBACK_GATTC_CONNECT(GATT_STATUS_SUCCESS,
 						prop_emu_remotes_default_set,
@@ -2033,11 +2027,9 @@ static struct test_case test_cases[] = {
 		CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
 		ACTION_SUCCESS(gatt_client_register_action, &app2_uuid),
 		CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
-		ACTION_SUCCESS(gatt_client_start_scan_action,
-							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
 		CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
-		ACTION_SUCCESS(gatt_client_stop_scan_action,
-							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
 		ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
 		CALLBACK_GATTC_CONNECT(GATT_STATUS_SUCCESS,
 						prop_emu_remotes_default_set,
@@ -2143,11 +2135,9 @@ static struct test_case test_cases[] = {
 		ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
 		ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
 		CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
-		ACTION_SUCCESS(gatt_client_start_scan_action,
-							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
 		CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
-		ACTION_SUCCESS(gatt_client_stop_scan_action,
-							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
 		ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
 		CALLBACK_GATTC_CONNECT(GATT_STATUS_SUCCESS,
 						prop_emu_remotes_default_set,
@@ -2167,11 +2157,9 @@ static struct test_case test_cases[] = {
 		ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
 		ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
 		CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
-		ACTION_SUCCESS(gatt_client_start_scan_action,
-							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
 		CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
-		ACTION_SUCCESS(gatt_client_stop_scan_action,
-							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
 		ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
 		CALLBACK_GATTC_CONNECT(GATT_STATUS_SUCCESS,
 						prop_emu_remotes_default_set,
@@ -2192,11 +2180,9 @@ static struct test_case test_cases[] = {
 		ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
 		ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
 		CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
-		ACTION_SUCCESS(gatt_client_start_scan_action,
-							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
 		CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
-		ACTION_SUCCESS(gatt_client_stop_scan_action,
-							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
 		ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
 		CALLBACK_GATTC_CONNECT(GATT_STATUS_SUCCESS,
 						prop_emu_remotes_default_set,
@@ -2215,11 +2201,9 @@ static struct test_case test_cases[] = {
 		ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
 		ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
 		CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
-		ACTION_SUCCESS(gatt_client_start_scan_action,
-							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
 		CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
-		ACTION_SUCCESS(gatt_client_stop_scan_action,
-							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
 		ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
 		CALLBACK_GATTC_CONNECT(GATT_STATUS_SUCCESS,
 						prop_emu_remotes_default_set,
@@ -2242,11 +2226,9 @@ static struct test_case test_cases[] = {
 		ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
 		ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
 		CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
-		ACTION_SUCCESS(gatt_client_start_scan_action,
-							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
 		CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
-		ACTION_SUCCESS(gatt_client_stop_scan_action,
-							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
 		ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
 		CALLBACK_GATTC_CONNECT(GATT_STATUS_SUCCESS,
 						prop_emu_remotes_default_set,
@@ -2270,11 +2252,9 @@ static struct test_case test_cases[] = {
 		ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
 		ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
 		CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
-		ACTION_SUCCESS(gatt_client_start_scan_action,
-							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
 		CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
-		ACTION_SUCCESS(gatt_client_stop_scan_action,
-							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
 		ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
 		CALLBACK_GATTC_CONNECT(GATT_STATUS_SUCCESS,
 						prop_emu_remotes_default_set,
@@ -2301,11 +2281,9 @@ static struct test_case test_cases[] = {
 		ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
 		ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
 		CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
-		ACTION_SUCCESS(gatt_client_start_scan_action,
-							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
 		CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
-		ACTION_SUCCESS(gatt_client_stop_scan_action,
-							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
 		ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
 		CALLBACK_GATTC_CONNECT(GATT_STATUS_SUCCESS,
 						prop_emu_remotes_default_set,
@@ -2339,11 +2317,9 @@ static struct test_case test_cases[] = {
 		ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
 		ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
 		CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
-		ACTION_SUCCESS(gatt_client_start_scan_action,
-							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
 		CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
-		ACTION_SUCCESS(gatt_client_stop_scan_action,
-							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
 		ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
 		CALLBACK_GATTC_CONNECT(GATT_STATUS_SUCCESS,
 						prop_emu_remotes_default_set,
@@ -2370,11 +2346,9 @@ static struct test_case test_cases[] = {
 		ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
 		ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
 		CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
-		ACTION_SUCCESS(gatt_client_start_scan_action,
-							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
 		CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
-		ACTION_SUCCESS(gatt_client_stop_scan_action,
-							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
 		ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
 		CALLBACK_GATTC_CONNECT(GATT_STATUS_SUCCESS,
 						prop_emu_remotes_default_set,
@@ -2397,11 +2371,9 @@ static struct test_case test_cases[] = {
 		ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
 		ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
 		CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
-		ACTION_SUCCESS(gatt_client_start_scan_action,
-							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
 		CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
-		ACTION_SUCCESS(gatt_client_stop_scan_action,
-							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
 		ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
 		CALLBACK_GATTC_CONNECT(GATT_STATUS_SUCCESS,
 						prop_emu_remotes_default_set,
@@ -2424,11 +2396,9 @@ static struct test_case test_cases[] = {
 		ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
 		ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
 		CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
-		ACTION_SUCCESS(gatt_client_start_scan_action,
-							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
 		CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
-		ACTION_SUCCESS(gatt_client_stop_scan_action,
-							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
 		ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
 		CALLBACK_GATTC_CONNECT(GATT_STATUS_SUCCESS,
 						prop_emu_remotes_default_set,
@@ -2452,11 +2422,9 @@ static struct test_case test_cases[] = {
 		ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
 		ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
 		CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
-		ACTION_SUCCESS(gatt_client_start_scan_action,
-							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
 		CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
-		ACTION_SUCCESS(gatt_client_stop_scan_action,
-							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
 		ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
 		CALLBACK_GATTC_CONNECT(GATT_STATUS_SUCCESS,
 						prop_emu_remotes_default_set,
@@ -2485,11 +2453,9 @@ static struct test_case test_cases[] = {
 		ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
 		ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
 		CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
-		ACTION_SUCCESS(gatt_client_start_scan_action,
-							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
 		CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
-		ACTION_SUCCESS(gatt_client_stop_scan_action,
-							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
 		ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
 		CALLBACK_GATTC_CONNECT(GATT_STATUS_SUCCESS,
 						prop_emu_remotes_default_set,
@@ -2517,11 +2483,9 @@ static struct test_case test_cases[] = {
 		ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
 		ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
 		CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
-		ACTION_SUCCESS(gatt_client_start_scan_action,
-							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
 		CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
-		ACTION_SUCCESS(gatt_client_stop_scan_action,
-							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
 		ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
 		CALLBACK_GATTC_CONNECT(GATT_STATUS_SUCCESS,
 						prop_emu_remotes_default_set,
@@ -2549,11 +2513,9 @@ static struct test_case test_cases[] = {
 		ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
 		ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
 		CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
-		ACTION_SUCCESS(gatt_client_start_scan_action,
-							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
 		CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
-		ACTION_SUCCESS(gatt_client_stop_scan_action,
-							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
 		ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
 		CALLBACK_GATTC_CONNECT(GATT_STATUS_SUCCESS,
 						prop_emu_remotes_default_set,
@@ -2585,11 +2547,9 @@ static struct test_case test_cases[] = {
 		ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
 		ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
 		CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
-		ACTION_SUCCESS(gatt_client_start_scan_action,
-							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
 		CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
-		ACTION_SUCCESS(gatt_client_stop_scan_action,
-							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
 		ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
 		CALLBACK_GATTC_CONNECT(GATT_STATUS_SUCCESS,
 						prop_emu_remotes_default_set,
@@ -2621,11 +2581,9 @@ static struct test_case test_cases[] = {
 		ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
 		ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
 		CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
-		ACTION_SUCCESS(gatt_client_start_scan_action,
-							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
 		CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
-		ACTION_SUCCESS(gatt_client_stop_scan_action,
-							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
 		ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
 		CALLBACK_GATTC_CONNECT(GATT_STATUS_SUCCESS,
 						prop_emu_remotes_default_set,
@@ -2657,11 +2615,9 @@ static struct test_case test_cases[] = {
 		ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
 		ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
 		CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
-		ACTION_SUCCESS(gatt_client_start_scan_action,
-							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
 		CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
-		ACTION_SUCCESS(gatt_client_stop_scan_action,
-							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
 		ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
 		CALLBACK_GATTC_CONNECT(GATT_STATUS_SUCCESS,
 						prop_emu_remotes_default_set,
@@ -2689,11 +2645,9 @@ static struct test_case test_cases[] = {
 		ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
 		ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
 		CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
-		ACTION_SUCCESS(gatt_client_start_scan_action,
-							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
 		CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
-		ACTION_SUCCESS(gatt_client_stop_scan_action,
-							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
 		ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
 		CALLBACK_GATTC_CONNECT(GATT_STATUS_SUCCESS,
 						prop_emu_remotes_default_set,
@@ -2721,11 +2675,9 @@ static struct test_case test_cases[] = {
 		ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
 		ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
 		CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
-		ACTION_SUCCESS(gatt_client_start_scan_action,
-							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
 		CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
-		ACTION_SUCCESS(gatt_client_stop_scan_action,
-							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
 		ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
 		CALLBACK_GATTC_CONNECT(GATT_STATUS_SUCCESS,
 						prop_emu_remotes_default_set,
@@ -2753,11 +2705,9 @@ static struct test_case test_cases[] = {
 		ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
 		ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
 		CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
-		ACTION_SUCCESS(gatt_client_start_scan_action,
-							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
 		CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
-		ACTION_SUCCESS(gatt_client_stop_scan_action,
-							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
 		ACTION_FAIL(gatt_client_write_characteristic_action,
 							&write_char_data_2),
 		CALLBACK_GATTC_WRITE_CHARACTERISTIC(GATT_STATUS_FAILURE,
@@ -2774,11 +2724,9 @@ static struct test_case test_cases[] = {
 		ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
 		ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
 		CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
-		ACTION_SUCCESS(gatt_client_start_scan_action,
-							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
 		CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
-		ACTION_SUCCESS(gatt_client_stop_scan_action,
-							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
 		ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
 		CALLBACK_GATTC_CONNECT(GATT_STATUS_SUCCESS,
 						prop_emu_remotes_default_set,
@@ -2806,11 +2754,9 @@ static struct test_case test_cases[] = {
 		ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
 		ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
 		CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
-		ACTION_SUCCESS(gatt_client_start_scan_action,
-							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
 		CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
-		ACTION_SUCCESS(gatt_client_stop_scan_action,
-							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
 		ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
 		CALLBACK_GATTC_CONNECT(GATT_STATUS_SUCCESS,
 						prop_emu_remotes_default_set,
@@ -2844,11 +2790,9 @@ static struct test_case test_cases[] = {
 		ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
 		ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
 		CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
-		ACTION_SUCCESS(gatt_client_start_scan_action,
-							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
 		CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
-		ACTION_SUCCESS(gatt_client_stop_scan_action,
-							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
 		ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
 		CALLBACK_GATTC_CONNECT(GATT_STATUS_SUCCESS,
 						prop_emu_remotes_default_set,
@@ -2879,11 +2823,9 @@ static struct test_case test_cases[] = {
 		ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
 		ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
 		CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
-		ACTION_SUCCESS(gatt_client_start_scan_action,
-							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
 		CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
-		ACTION_SUCCESS(gatt_client_stop_scan_action,
-							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
 		ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
 		CALLBACK_GATTC_CONNECT(GATT_STATUS_SUCCESS,
 						prop_emu_remotes_default_set,
@@ -2914,11 +2856,9 @@ static struct test_case test_cases[] = {
 		ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
 		ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
 		CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
-		ACTION_SUCCESS(gatt_client_start_scan_action,
-							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
 		CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
-		ACTION_SUCCESS(gatt_client_stop_scan_action,
-							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
 		ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
 		CALLBACK_GATTC_CONNECT(GATT_STATUS_SUCCESS,
 						prop_emu_remotes_default_set,
@@ -2950,11 +2890,9 @@ static struct test_case test_cases[] = {
 		ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
 		ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
 		CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
-		ACTION_SUCCESS(gatt_client_start_scan_action,
-							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
 		CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
-		ACTION_SUCCESS(gatt_client_stop_scan_action,
-							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
 		ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
 		CALLBACK_GATTC_CONNECT(GATT_STATUS_SUCCESS,
 						prop_emu_remotes_default_set,
@@ -2986,11 +2924,9 @@ static struct test_case test_cases[] = {
 		ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
 		ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
 		CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
-		ACTION_SUCCESS(gatt_client_start_scan_action,
-							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_start_scan_action, NULL),
 		CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
-		ACTION_SUCCESS(gatt_client_stop_scan_action,
-							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_stop_scan_action, NULL),
 		ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
 		CALLBACK_GATTC_CONNECT(GATT_STATUS_SUCCESS,
 						prop_emu_remotes_default_set,