diff --git a/android/pts-gatt.txt b/android/pts-gatt.txt
index a15c1d2..9c8d191 100644
--- a/android/pts-gatt.txt
+++ b/android/pts-gatt.txt
@@ -46,10 +46,59 @@ TC_GAD_CL_BV_05_C	PASS	haltest:
 				handle: check from btmon logs
 TC_GAD_CL_BV_06_C	PASS	haltest:
 				when requested: gattc get_descriptor
-TC_GAD_CL_BV_07_C	PASS
-TC_GAD_CL_BV_08_C	PASS
-				For the server tests:
-				haltest:
+TC_GAD_CL_BV_07_C	N/A
+TC_GAD_CL_BV_08_C	N/A
+TC_GAD_SR_BV_01_C	PASS	haltest:
+				gattc register_client
+				gattc listen
+				gatts register_server
+				gatts add_service
+				gatts add_characteristic
+				gatts start_service
+				gatts add_service
+				gatts add_included_service
+				gatts start_service
+TC_GAD_SR_BV_02_C	PASS	haltest:
+				gattc register_client
+				gattc listen
+				gatts register_server
+				gatts add_service
+				gatts add_characteristic
+				gatts start_service
+				gatts add_service
+				gatts add_included_service
+				gatts start_service
+TC_GAD_SR_BV_03_C	PASS	haltest:
+				gattc register_client
+				gattc listen
+				gatts register_server
+				gatts add_service
+				gatts add_characteristic
+				gatts start_service
+				gatts add_service
+				gatts add_included_service
+				gatts start_service
+TC_GAD_SR_BV_04_C	PASS	haltest:
+				gattc register_client
+				gattc listen
+				gatts register_server
+				gatts add_service
+				gatts add_characteristic
+				gatts start_service
+				gatts add_service
+				gatts add_included_service
+				gatts start_service
+TC_GAD_SR_BV_05_C	PASS	haltest:
+				gattc register_client
+				gattc listen
+				gatts register_server
+				gatts add_service
+				gatts add_characteristic
+				gatts start_service
+				gatts add_service
+				gatts add_included_service
+				gatts start_service
+TC_GAD_SR_BV_06_C	PASS	haltest:
 				gattc register_client
 				gattc listen
 				gatts register_server
@@ -59,12 +108,6 @@ TC_GAD_CL_BV_08_C	PASS
 				gatts add_service
 				gatts add_included_service
 				gatts start_service
-TC_GAD_SR_BV_01_C	PASS
-TC_GAD_SR_BV_02_C	PASS
-TC_GAD_SR_BV_03_C	PASS
-TC_GAD_SR_BV_04_C	PASS
-TC_GAD_SR_BV_05_C	PASS
-TC_GAD_SR_BV_06_C	PASS
 TC_GAD_SR_BV_07_C	N/A
 TC_GAD_SR_BV_08_C	N/A
 TC_GAR_CL_BV_01_C	PASS	haltest:
@@ -97,12 +140,12 @@ TC_GAR_CL_BI_15_C	PASS	haltest:
 TC_GAR_CL_BI_16_C	PASS	haltest:
 				gattc read_characteristic
 TC_GAR_CL_BI_17_C	INC	not implemented (encryption)
-TC_GAR_CL_BV_05_C	INC	JIRA: BZ-32
-TC_GAR_CL_BI_18_C	INC	JIRA: BZ-32
-TC_GAR_CL_BI_19_C	INC	JIRA: BZ-32
-TC_GAR_CL_BI_20_C	INC	JIRA: BZ-32
-TC_GAR_CL_BI_21_C	INC	JIRA: BZ-32
-TC_GAR_CL_BI_22_C	INC	JIRA: BZ-32
+TC_GAR_CL_BV_05_C	N/A
+TC_GAR_CL_BI_18_C	N/A
+TC_GAR_CL_BI_19_C	N/A
+TC_GAR_CL_BI_20_C	INC
+TC_GAR_CL_BI_21_C	INC
+TC_GAR_CL_BI_22_C	INC
 TC_GAR_CL_BV_06_C	PASS	haltest:
 				gattc read_descriptor
 TC_GAR_CL_BI_23_C	PASS	haltest:
@@ -127,7 +170,7 @@ TC_GAR_CL_BI_31_C	PASS	haltest:
 TC_GAR_CL_BI_32_C	PASS	haltest:
 				gattc read_descriptor
 TC_GAR_CL_BI_33_C	INC	not implemented (encryption)
-TC_GAR_CL_BI_34_C	INC	PTS issue - to be confirmed
+TC_GAR_CL_BI_34_C	N/A
 TC_GAR_CL_BI_35_C	PASS	haltest:
 				gattc read_characteristic
 TC_GAR_SR_BV_01_C	PASS
@@ -224,12 +267,12 @@ TC_GAR_SR_BI_17_C	PASS	haltest:
 						 <properties> 2 <permissions> 1
 				gatts start_service
 				gatts send_response: <status> 12
-TC_GAR_SR_BV_05_C	INC
-TC_GAR_SR_BI_18_C	INC
-TC_GAR_SR_BI_19_C	INC
-TC_GAR_SR_BI_20_C	INC
-TC_GAR_SR_BI_21_C	INC
-TC_GAR_SR_BI_22_C	INC
+TC_GAR_SR_BV_05_C	N/A
+TC_GAR_SR_BI_18_C	N/A
+TC_GAR_SR_BI_19_C	N/A
+TC_GAR_SR_BI_20_C	N/A
+TC_GAR_SR_BI_21_C	N/A
+TC_GAR_SR_BI_22_C	N/A
 TC_GAR_SR_BV_06_C	PASS	haltest:
 				gatts add_service
 				gatts add_characteristic:
@@ -333,9 +376,9 @@ TC_GAR_SR_BI_33_C	PASS	haltest:
 				gatts add_descriptor: <permissions> 1
 				gatts start_service
 				gatts send_response: <status> 12
-TC_GAR_SR_BI_34_C	INC
-TC_GAR_SR_BI_35_C	INC
-TC_GAW_CL_BV_01_C	PASS 	haltest:
+TC_GAR_SR_BI_34_C	N/A
+TC_GAR_SR_BI_35_C	N/A
+TC_GAW_CL_BV_01_C	PASS	haltest:
 				gattc connect
 				gattc search_service
 				gattc get_characteristic: srvc_id based on
@@ -343,7 +386,7 @@ TC_GAW_CL_BV_01_C	PASS 	haltest:
 				gattc write_characteristic
 				gattc disconnect
 TC_GAW_CL_BV_02_C	INC
-TC_GAW_CL_BV_03_C	PASS 	haltest:
+TC_GAW_CL_BV_03_C	PASS	haltest:
 				gattc connect
 				gattc search_service
 				gattc get_characteristic: srvc_id based on