diff --git a/test/pts/a2dp_sink.md b/test/pts/a2dp_sink.md
index 006ad5882..26e503509 100644
--- a/test/pts/a2dp_sink.md
+++ b/test/pts/a2dp_sink.md
@@ -1,30 +1,31 @@
 use avdtp_sink_test:
 A2DP/SNK/AS/BV-01-I : (wait)
 
-A2DP/SNK/CC/BV-01-I : (wait)
-A2DP/SNK/CC/BV-02-I : (wait)
-A2DP/SNK/CC/BV-03-I : (wait)
-A2DP/SNK/CC/BV-04-I : (wait)
-A2DP/SNK/CC/BV-05-I : (wait)
-A2DP/SNK/CC/BV-06-I : (wait)
-A2DP/SNK/CC/BV-07-I : (wait)
-A2DP/SNK/CC/BV-08-I : (wait)
+A2DP/SNK/CC/BV-01-I : (confirm)
+A2DP/SNK/CC/BV-02-I : (confirm)
+A2DP/SNK/CC/BV-03-I : (confirm)
+A2DP/SNK/CC/BV-04-I : (confirm)
+A2DP/SNK/CC/BV-05-I : (confirm)
+A2DP/SNK/CC/BV-06-I : (confirm)
+A2DP/SNK/CC/BV-07-I : (confirm)
+A2DP/SNK/CC/BV-08-I : (confirm)
 
-use pts/avdtp_sink_test:
 A2DP/SNK/REL/BV-01-I : (wait)
 A2DP/SNK/REL/BV-02-I : S
 
+A2DP/SNK/SDP/BV-02-I: (confirm)
+
 A2DP/SNK/SET/BV-01-I : (wait)
-A2DP/SNK/SET/BV-02-I : d, g, s, o
+A2DP/SNK/SET/BV-02-I : g, s, o
 A2DP/SNK/SET/BV-03-I : (wait)
-A2DP/SNK/SET/BV-04-I : d, g, s, o, m
-A2DP/SNK/SET/BV-05-I : C, C, C, C
-A2DP/SNK/SET/BV-06-I : (d, g, s, o, m, C, c) x 4
+A2DP/SNK/SET/BV-04-I : g, s, o, m
+A2DP/SNK/SET/BV-05-I : (C, (OK)) x 2
+A2DP/SNK/SET/BV-06-I : (g, s, o, m, C, c) x 4
 
 A2DP/SNK/SUS/BV-01-I : (wait)
 A2DP/SNK/SUS/BV-02-I : P
 
-A2DP/SNK/SUS/BV-01-I : (D, (confirmation)) x 4
+A2DP/SNK/SUS/BV-01-I : (D, (confirm)) x 4
 
 IOPT/CL/A2DP-SNK/SFC/BV-02-I : 
     rm /tmp/btstack_*
diff --git a/test/pts/a2dp_source.md b/test/pts/a2dp_source.md
index 841cbc2ad..fc09754f9 100644
--- a/test/pts/a2dp_source.md
+++ b/test/pts/a2dp_source.md
@@ -1,20 +1,21 @@
-A2DP/SRC/AS/BV-01-I : (confirmation)
+use avdtp_source_test:
+A2DP/SRC/AS/BV-01-I : g, s, o, m, (confirm)
 
-A2DP/SRC/CC/BV-09-I : m
-A2DP/SRC/CC/BV-10-I : m
+A2DP/SRC/CC/BV-09-I : (wait)
+A2DP/SRC/CC/BV-10-I : (wait)
 
-A2DP/SRC/REL/BV-01-I : d, g, s, o, m, S
-A2DP/SRC/REL/BV-02-I : d, g, s, o, m
+A2DP/SRC/REL/BV-01-I : g, s, o, m, S
+A2DP/SRC/REL/BV-02-I : g, s, o, m
 
-A2DP/SRC/SET/BV-01-I : d, g, s, o
+A2DP/SRC/SET/BV-01-I : g, s, o
 A2DP/SRC/SET/BV-02-I : (wait)
-A2DP/SRC/SET/BV-03-I : d, g, s, o, m
-A2DP/SRC/SET/BV-04-I : m
-A2DP/SRC/SET/BV-05-I : (d, g, s, o, m, C, c) x 4
-A2DP/SRC/SET/BV-06-I : (m, C, (ok)) x 4
+A2DP/SRC/SET/BV-03-I : g, s, o, m
+A2DP/SRC/SET/BV-04-I : (wait)
+A2DP/SRC/SET/BV-05-I : (g, s, o, m, C, c) x 4
+A2DP/SRC/SET/BV-06-I : (C, (ok)) x 3
 
-A2DP/SRC/SUS/BV-01-I : d, g, s, o, m, P
-A2DP/SRC/SUS/BV-02-I : d, g, s, o, m
+A2DP/SRC/SUS/BV-01-I : g, s, o, m, P
+A2DP/SRC/SUS/BV-02-I : g, s, o, m
 
 IOPT/CL/A2DP-SRC/SFC/BV-01-I : 
     rm /tmp/btstack_*
diff --git a/test/pts/avdtp_source.md b/test/pts/avdtp_source.md
index e6e7c6b88..196e7b380 100644
--- a/test/pts/avdtp_source.md
+++ b/test/pts/avdtp_source.md
@@ -1,41 +1,41 @@
 AVDTP/SRC/ACP/SIG/SMG/BV-06-C : (wait)
 AVDTP/SRC/ACP/SIG/SMG/BV-08-C : (wait)
 AVDTP/SRC/ACP/SIG/SMG/BV-10-C : (wait)
-AVDTP/SRC/ACP/SIG/SMG/BV-12-C : c
+AVDTP/SRC/ACP/SIG/SMG/BV-12-C : (wait)
 AVDTP/SRC/ACP/SIG/SMG/BV-14-C : d, g, s, o, m
 AVDTP/SRC/ACP/SIG/SMG/BV-16-C : (wait)
-AVDTP/SRC/ACP/SIG/SMG/BV-18-C : m
-AVDTP/SRC/ACP/SIG/SMG/BV-20-C : m
-AVDTP/SRC/ACP/SIG/SMG/BV-22-C : m
+AVDTP/SRC/ACP/SIG/SMG/BV-18-C : (wait)
+AVDTP/SRC/ACP/SIG/SMG/BV-20-C : (wait)
+AVDTP/SRC/ACP/SIG/SMG/BV-22-C : (wait)
 AVDTP/SRC/ACP/SIG/SMG/BV-24-C : (wait)
 AVDTP/SRC/ACP/SIG/SMG/BV-26-C : (wait)
 AVDTP/SRC/ACP/SIG/SMG/ESR05/BV-14-C : (wait)
-AVDTP/SRC/ACP/SIG/SMG/BI-05-C : c
+AVDTP/SRC/ACP/SIG/SMG/BI-05-C : (wait)
 AVDTP/SRC/ACP/SIG/SMG/BI-08-C : (wait)
-AVDTP/SRC/ACP/SIG/SMG/BI-11-C : c
-AVDTP/SRC/ACP/SIG/SMG/BI-14-C : c
-AVDTP/SRC/ACP/SIG/SMG/BI-17-C : c
-AVDTP/SRC/ACP/SIG/SMG/BI-20-C : c
+AVDTP/SRC/ACP/SIG/SMG/BI-11-C : (wait)
+AVDTP/SRC/ACP/SIG/SMG/BI-14-C : (wait)
+AVDTP/SRC/ACP/SIG/SMG/BI-17-C : (wait)
+AVDTP/SRC/ACP/SIG/SMG/BI-20-C : (wait)
 AVDTP/SRC/ACP/SIG/SMG/BI-23-C : d, g, s, o, m
-AVDTP/SRC/ACP/SIG/SMG/BI-26-C : c
-AVDTP/SRC/ACP/SIG/SMG/BI-33-C : c
-AVDTP/SRC/ACP/SIG/SMG/ESR04/BI-28-C : c
+AVDTP/SRC/ACP/SIG/SMG/BI-26-C : (wait)
+AVDTP/SRC/ACP/SIG/SMG/BI-33-C : (wait)
+AVDTP/SRC/ACP/SIG/SMG/ESR04/BI-28-C : (wait)
 
-AVDTP/SRC/ACP/TRA/BTR/BI-01-C : c, c
+AVDTP/SRC/ACP/TRA/BTR/BI-01-C : (wait)
 
-AVDTP/SRC/INT/SIG/SMG/BV-05-C : c
-AVDTP/SRC/INT/SIG/SMG/BV-07-C : c, g
+AVDTP/SRC/INT/SIG/SMG/BV-05-C : d
+AVDTP/SRC/INT/SIG/SMG/BV-07-C : g
 AVDTP/SRC/INT/SIG/SMG/BV-09-C : g, s
 AVDTP/SRC/INT/SIG/SMG/BV-11-C : f
-AVDTP/SRC/INT/SIG/SMG/BV-13-C : s, g, o, m, P, R
-AVDTP/SRC/INT/SIG/SMG/BV-15-C : s, g, o
-AVDTP/SRC/INT/SIG/SMG/BV-17-C : s, g, o, m
-AVDTP/SRC/INT/SIG/SMG/BV-19-C : s, g, o, m, S
-AVDTP/SRC/INT/SIG/SMG/BV-21-C : s, g, o, m, P
-AVDTP/SRC/INT/SIG/SMG/BV-23-C : s, g, o, m, A
+AVDTP/SRC/INT/SIG/SMG/BV-13-C : g, s, o, m, P, R
+AVDTP/SRC/INT/SIG/SMG/BV-15-C : g, s, o
+AVDTP/SRC/INT/SIG/SMG/BV-17-C : g, s, o, m
+AVDTP/SRC/INT/SIG/SMG/BV-19-C : g, s, o, m, S
+AVDTP/SRC/INT/SIG/SMG/BV-21-C : g, s, o, m, P
+AVDTP/SRC/INT/SIG/SMG/BV-23-C : g, s, o, m, A
 AVDTP/SRC/INT/SIG/SMG/BV-25-C : a
 AVDTP/SRC/INT/SIG/SMG/BV-28-C : a, (confirmation)
-AVDTP/SRC/INT/SIG/SMG/BV-31-C : g
+AVDTP/SRC/INT/SIG/SMG/BV-31-C : g, s
 AVDTP/SRC/INT/SIG/SMG/ESR05/BV-13-C : R
 AVDTP/SRC/INT/SIG/SMG/BI-30-C : g, s
 AVDTP/SRC/INT/SIG/SMG/BI-35-C : a, s