diff --git a/test/ble_client/Makefile b/test/ble_client/Makefile
index a3e5bb5d1..f3a5df286 100644
--- a/test/ble_client/Makefile
+++ b/test/ble_client/Makefile
@@ -6,7 +6,7 @@ BTSTACK_ROOT =  ../..
 
 CFLAGS  = -g -Wall -I. -I${BTSTACK_ROOT}/src -I${BTSTACK_ROOT}/include
 CFLAGS += -fprofile-arcs -ftest-coverage
-LDFLAGS += -L$(CPPUTEST_HOME)/lib -lCppUTest -lCppUTestExt
+LDFLAGS += -lCppUTest -lCppUTestExt
 
 VPATH += ${BTSTACK_ROOT}/src/ble 
 VPATH += ${BTSTACK_ROOT}/src
@@ -26,16 +26,16 @@ COMMON = \
 	
 COMMON_OBJ = $(COMMON:.c=.o)
 
-all: ad_parser
+all: ad_parser_test
 
-ad_parser: ${CORE_OBJ} ${COMMON_OBJ} advertising_data_parser.c
-	${CC} ${CORE_OBJ} ${COMMON_OBJ} advertising_data_parser.c ${CFLAGS} ${LDFLAGS} -o $@
+ad_parser_test: ${CORE_OBJ} ${COMMON_OBJ} ad_parser_test.c
+	${CC} ${CORE_OBJ} ${COMMON_OBJ} ad_parser_test.c ${CFLAGS} ${LDFLAGS} -o $@
 
 test: all
-	./ad_parser
+	./ad_parser_test
 
 clean:
-	rm -f  ad_parser le_central
+	rm -f  ad_parser_test
 	rm -f  *.o
 	rm -rf *.dSYM
 	rm -f *.gcno *.gcda
diff --git a/test/ble_client/advertising_data_parser.c b/test/ble_client/ad_parser_test.c
similarity index 73%
rename from test/ble_client/advertising_data_parser.c
rename to test/ble_client/ad_parser_test.c
index d9b60e619..9ec5954be 100644
--- a/test/ble_client/advertising_data_parser.c
+++ b/test/ble_client/ad_parser_test.c
@@ -53,6 +53,7 @@
 #include "hci_cmd.h"
 
 #include "btstack_memory.h"
+#include "bluetooth_data_types.h"
 #include "hci.h"
 #include "ad_parser.h"
 #include "l2cap.h"
@@ -69,8 +70,21 @@ typedef struct ad_event {
     uint8_t * data;
 } ad_event_t;
 
-static uint8_t ad_data[] =   {0x02, 0x01, 0x05, 0x03, 0x02, 0xF0, 0xFF};
-static uint8_t adv_data_2[] = { 8, 0x09, 'B', 'T', 's', 't', 'a', 'c', 'k' }; 
+static const uint8_t ad_data[] =    { 0x02, 0x01, 0x05, /* -- */ 0x03, 0x02, 0xF0, 0xFF};
+static const uint8_t adv_data_2[] = { 8, 0x09, 'B', 'T', 's', 't', 'a', 'c', 'k' }; 
+static const uint8_t adv_data[] = {
+    // Flags general discoverable, BR/EDR not supported
+    0x02, BLUETOOTH_DATA_TYPE_FLAGS, 0x06, 
+    // Name
+    0x0c, BLUETOOTH_DATA_TYPE_COMPLETE_LOCAL_NAME, 'L', 'E', ' ', 'S', 't', 'r', 'e', 'a', 'm', 'e', 'r', 
+    // Incomplete List of 16-bit Service Class UUIDs -- FF10 - only valid for testing!
+    0x03, BLUETOOTH_DATA_TYPE_INCOMPLETE_LIST_OF_16_BIT_SERVICE_CLASS_UUIDS, 0x10, 0xff,
+
+    17, BLUETOOTH_DATA_TYPE_COMPLETE_LIST_OF_128_BIT_SERVICE_CLASS_UUIDS, 0x9e, 0xca, 0xdc, 0x24, 0xe, 0xe5, 0xa9, 0xe0, 0x93, 0xf3, 0xa3, 0xb5, 0x1, 0x0, 0x40, 0x6e,
+
+    17, BLUETOOTH_DATA_TYPE_COMPLETE_LIST_OF_128_BIT_SERVICE_CLASS_UUIDS, 0xFB, 0x34, 0x9B, 0x5F, 0x80, 0x00, /* - */ 0x00, 0x80, /* - */ 0x00, 0x10, /* - */ 0x00, 0x00, /* - */  0x10, 0xaa, 0x00, 0x00
+};
+
 
 static uint8_t expected_bt_addr[] = {0x34, 0xB1, 0xF7, 0xD1, 0x77, 0x9B};
 static uint8_t adv_multi_packet[] = {
@@ -126,7 +140,7 @@ void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint
     adv_index++;
 }
 
-bool nameHasPrefix(const char * name_prefix, uint16_t data_length, uint8_t * data){
+bool nameHasPrefix(const char * name_prefix, uint16_t data_length, const uint8_t * data){
     ad_context_t context;
     int name_prefix_len = strlen(name_prefix);
     for (ad_iterator_init(&context, data_length, data) ; ad_iterator_has_more(&context) ; ad_iterator_next(&context)){
@@ -203,6 +217,54 @@ TEST(ADParser, TestMalformed){
     CHECK_EQUAL(ad_iterator_has_more(&context), 0);
 }
 
+TEST(ADParser, ad_data_contains_uuid16){
+    bool contains_uuid;
+
+    contains_uuid = ad_data_contains_uuid16(sizeof(adv_data_2), adv_data_2, 0x00);
+    CHECK(!contains_uuid);
+
+    contains_uuid = ad_data_contains_uuid16(sizeof(adv_data), adv_data, 0x00);
+    CHECK(!contains_uuid);
+
+    contains_uuid = ad_data_contains_uuid16(sizeof(adv_data), adv_data,  0xff10);
+    CHECK(contains_uuid);
+
+    contains_uuid = ad_data_contains_uuid16(sizeof(adv_data), adv_data,  0xaa10);
+    CHECK(contains_uuid);
+}
+
+TEST(ADParser, ad_data_contains_uuid128){
+    bool contains_uuid;
+    {
+        uint8_t ad_uuid128[16];
+        memset(ad_uuid128, 0, 16);
+        contains_uuid = ad_data_contains_uuid128(sizeof(adv_data_2), adv_data_2, ad_uuid128);
+        CHECK(!contains_uuid);
+
+        contains_uuid = ad_data_contains_uuid128(sizeof(adv_data), adv_data, ad_uuid128);
+        CHECK(!contains_uuid);
+    }
+
+
+    {
+        uint8_t uuid128_le[] = {0x9e, 0xca, 0xdc, 0x24, 0xe, 0xe5, 0xa9, 0xe0, 0x93, 0xf3, 0xa3, 0xb5, 0x1, 0x0, 0x40, 0x6e};
+        uint8_t ad_uuid128[16];
+        reverse_128(uuid128_le, ad_uuid128);
+
+        contains_uuid = ad_data_contains_uuid128(sizeof(adv_data), adv_data, ad_uuid128);
+        CHECK(contains_uuid);
+    }
+
+    {
+        uint8_t uuid128_le[] = {0xFB, 0x34, 0x9B, 0x5F, 0x80, 0x00, 0x00, 0x80, 0x00, 0x10, 0x00, 0x00, 0x10, 0xaa, 0x00, 0x00};
+        uint8_t ad_uuid128[16];
+        reverse_128(uuid128_le, ad_uuid128);
+
+        contains_uuid = ad_data_contains_uuid128(sizeof(adv_data), adv_data, ad_uuid128);
+        CHECK(contains_uuid);
+    }
+}
+
 int main (int argc, const char * argv[]){
     return CommandLineTestRunner::RunAllTests(argc, argv);
 }