diff --git a/host/xtest/Makefile b/host/xtest/Makefile
index 2b321d0..5fd051c 100644
--- a/host/xtest/Makefile
+++ b/host/xtest/Makefile
@@ -40,6 +40,8 @@
 	adbg/src/security_utils_mem.c
 
 ifeq ($(CFG_GP_TESTSUITE_ENABLE), y)
+CFLAGS += -DCFG_GP_TESTSUITE_ENABLE
+
 srcs  += xtest_7500.c \
 	 xtest_8000.c \
 	 xtest_8500.c \
diff --git a/host/xtest/adbg_case_declare.h b/host/xtest/adbg_case_declare.h
deleted file mode 100644
index 7a76393..0000000
--- a/host/xtest/adbg_case_declare.h
+++ /dev/null
@@ -1,734 +0,0 @@
-/*
- * Copyright (c) 2014, STMicroelectronics International N.V.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License Version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- */
-
-#ifndef ADBG_CASE_DECLARE_H
-#define ADBG_CASE_DECLARE_H
-
-#define ADBG_CASE_DECLARE_AUTO_GENERATED_TESTS() \
-	ADBG_CASE_DECLARE(XTEST_TEE_7001);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7002);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7003);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7004);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7005);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7006);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7007);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7008);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7009);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7010);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7011);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7012);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7013);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7014);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7015);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7016);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7017);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7018);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7019);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7020);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7021);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7022);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7023);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7024);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7025);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7026);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7027);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7028);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7029);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7030);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7031);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7032);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7033);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7034);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7035);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7036);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7037);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7038);\
-	\
-	ADBG_CASE_DECLARE(XTEST_TEE_7501);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7502);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7503);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7504);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7505);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7506);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7507);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7508);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7509);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7510);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7511);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7512);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7513);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7514);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7515);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7516);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7517);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7518);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7519);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7520);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7521);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7522);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7523);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7524);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7525);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7526);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7527);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7528);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7529);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7530);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7531);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7532);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7533);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7534);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7535);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7536);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7537);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7538);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7539);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7540);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7541);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7542);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7543);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7544);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7545);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7546);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7547);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7548);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7549);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7550);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7551);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7552);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7553);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7554);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7555);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7556);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7557);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7558);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7559);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7560);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7561);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7562);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7563);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7564);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7565);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7566);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7567);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7568);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7569);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7570);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7571);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7572);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7573);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7574);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7575);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7576);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7577);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7578);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7579);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7580);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7581);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7582);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7583);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7584);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7585);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7586);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7587);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7588);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7589);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7590);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7591);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7592);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7593);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7594);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7595);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7596);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7597);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7598);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7599);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7600);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7601);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7602);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7603);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7604);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7605);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7606);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7607);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7608);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7609);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7610);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7611);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7612);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7613);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7614);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7615);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7616);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7617);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7618);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7619);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7620);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7621);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7622);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7623);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7624);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7625);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7626);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7627);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7628);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7629);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7630);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7631);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7632);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7633);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7634);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7635);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7636);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7637);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7638);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7639);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7640);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7641);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7642);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7643);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7644);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7645);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7646);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7647);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7648);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7649);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7650);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7651);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7652);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7653);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7654);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7655);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7656);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7657);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7658);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7659);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7660);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7661);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7662);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7663);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7664);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7665);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7666);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7667);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7668);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7669);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7670);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7671);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7672);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7673);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7674);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7675);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7676);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7677);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7678);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7679);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7680);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7681);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7682);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7683);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7684);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7685);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7686);\
-	ADBG_CASE_DECLARE(XTEST_TEE_7687);\
-	\
-	ADBG_CASE_DECLARE(XTEST_TEE_8001);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8002);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8003);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8004);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8005);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8006);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8007);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8008);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8009);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8010);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8011);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8012);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8013);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8014);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8015);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8016);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8017);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8018);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8019);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8020);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8021);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8022);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8023);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8024);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8025);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8026);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8027);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8028);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8029);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8030);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8031);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8032);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8033);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8034);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8035);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8036);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8037);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8038);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8039);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8040);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8041);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8042);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8043);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8044);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8045);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8046);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8047);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8048);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8049);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8050);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8051);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8052);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8053);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8054);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8055);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8056);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8057);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8058);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8059);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8060);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8061);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8062);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8063);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8064);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8065);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8066);\
-	\
-	ADBG_CASE_DECLARE(XTEST_TEE_8501);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8502);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8503);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8504);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8505);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8506);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8507);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8508);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8509);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8510);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8511);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8512);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8513);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8514);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8515);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8516);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8517);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8518);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8519);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8520);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8521);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8522);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8523);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8524);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8525);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8526);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8527);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8528);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8529);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8530);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8531);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8532);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8533);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8534);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8535);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8536);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8537);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8538);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8539);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8540);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8541);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8542);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8543);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8544);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8545);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8546);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8547);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8548);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8549);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8550);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8551);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8552);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8553);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8554);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8555);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8556);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8557);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8558);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8559);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8560);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8561);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8562);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8563);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8564);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8565);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8566);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8567);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8568);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8569);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8570);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8571);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8572);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8573);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8574);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8575);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8576);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8577);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8578);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8579);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8580);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8581);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8582);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8583);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8584);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8585);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8586);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8587);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8588);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8589);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8590);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8591);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8592);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8593);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8594);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8595);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8596);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8597);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8598);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8599);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8600);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8601);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8602);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8603);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8604);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8605);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8606);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8607);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8608);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8609);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8610);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8611);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8612);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8613);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8614);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8615);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8616);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8617);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8618);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8619);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8620);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8621);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8622);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8623);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8624);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8625);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8626);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8627);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8628);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8629);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8630);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8631);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8632);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8633);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8634);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8635);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8636);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8637);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8638);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8639);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8640);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8641);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8642);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8643);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8644);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8645);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8646);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8647);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8648);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8649);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8650);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8651);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8652);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8653);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8654);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8655);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8656);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8657);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8658);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8659);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8660);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8661);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8662);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8663);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8664);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8665);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8666);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8667);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8668);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8669);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8670);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8671);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8672);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8673);\
-	ADBG_CASE_DECLARE(XTEST_TEE_8674);\
-	\
-	ADBG_CASE_DECLARE(XTEST_TEE_9001);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9002);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9003);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9004);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9005);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9006);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9007);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9008);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9009);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9010);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9011);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9012);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9013);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9014);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9015);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9016);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9017);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9018);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9019);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9020);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9021);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9022);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9023);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9024);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9025);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9026);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9027);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9028);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9029);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9030);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9031);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9032);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9033);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9034);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9035);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9036);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9037);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9038);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9039);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9040);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9041);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9042);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9043);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9044);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9045);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9046);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9047);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9048);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9049);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9050);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9051);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9052);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9053);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9054);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9055);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9056);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9057);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9058);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9059);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9060);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9061);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9062);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9063);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9064);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9065);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9066);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9067);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9068);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9069);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9070);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9071);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9072);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9073);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9074);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9075);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9076);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9077);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9078);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9079);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9080);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9081);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9082);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9083);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9084);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9085);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9086);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9087);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9088);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9089);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9090);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9091);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9092);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9093);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9094);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9095);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9096);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9097);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9098);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9099);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9100);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9101);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9102);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9103);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9104);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9105);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9106);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9107);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9108);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9109);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9110);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9111);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9112);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9113);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9114);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9115);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9116);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9117);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9118);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9119);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9120);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9121);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9122);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9123);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9124);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9125);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9126);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9127);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9128);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9129);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9130);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9131);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9132);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9133);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9134);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9135);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9136);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9137);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9138);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9139);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9140);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9141);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9142);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9143);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9144);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9145);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9146);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9147);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9148);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9149);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9150);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9151);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9152);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9153);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9154);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9155);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9156);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9157);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9158);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9159);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9160);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9161);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9162);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9163);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9164);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9165);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9166);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9167);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9168);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9169);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9170);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9171);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9172);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9173);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9174);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9175);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9176);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9177);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9178);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9179);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9180);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9181);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9182);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9183);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9184);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9185);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9186);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9187);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9188);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9189);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9190);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9191);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9192);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9193);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9194);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9195);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9196);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9197);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9198);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9199);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9200);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9201);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9202);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9203);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9204);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9205);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9206);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9207);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9208);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9209);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9210);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9211);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9212);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9213);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9214);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9215);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9216);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9217);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9218);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9219);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9220);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9221);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9222);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9223);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9224);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9225);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9226);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9227);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9228);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9229);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9230);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9231);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9232);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9233);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9234);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9235);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9236);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9237);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9238);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9239);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9240);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9241);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9242);\
-	ADBG_CASE_DECLARE(XTEST_TEE_9243);\
-
-/* end of case declarations */
-
-
-#endif /*ADBG_CASE_DECLARE_H*/
diff --git a/host/xtest/adbg_entry_declare.h b/host/xtest/adbg_entry_declare.h
deleted file mode 100644
index 14892c1..0000000
--- a/host/xtest/adbg_entry_declare.h
+++ /dev/null
@@ -1,733 +0,0 @@
-/*
- * Copyright (c) 2014, STMicroelectronics International N.V.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License Version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- */
-
-#ifndef ADBG_ENTRY_DECLARE_H
-#define ADBG_ENTRY_DECLARE_H
-
-#define ADBG_ENTRY_AUTO_GENERATED_TESTS() \
-	ADBG_SUITE_ENTRY(XTEST_TEE_7001, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7002, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7003, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7004, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7005, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7006, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7007, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7008, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7009, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7010, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7011, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7012, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7013, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7014, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7015, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7016, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7017, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7018, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7019, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7020, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7021, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7022, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7023, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7024, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7025, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7026, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7027, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7028, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7029, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7030, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7031, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7032, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7033, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7034, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7035, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7036, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7037, NULL)\
-	/*ADBG_SUITE_ENTRY(XTEST_TEE_7038, NULL)*/\
-	\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7501, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7502, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7503, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7504, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7505, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7506, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7507, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7508, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7509, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7510, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7511, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7512, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7513, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7514, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7515, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7516, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7517, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7518, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7519, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7520, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7521, NULL)\
-	/*ADBG_SUITE_ENTRY(XTEST_TEE_7522, NULL)*/\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7523, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7524, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7525, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7526, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7527, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7528, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7529, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7530, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7531, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7532, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7533, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7534, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7535, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7536, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7537, NULL)\
-	/*ADBG_SUITE_ENTRY(XTEST_TEE_7538, NULL)*/\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7539, NULL)\
-	/*ADBG_SUITE_ENTRY(XTEST_TEE_7540, NULL)*/\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7541, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7542, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7543, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7544, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7545, NULL)\
-	/*ADBG_SUITE_ENTRY(XTEST_TEE_7546, NULL)*/\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7547, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7548, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7549, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7550, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7551, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7552, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7553, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7554, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7555, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7556, NULL)\
-	/*ADBG_SUITE_ENTRY(XTEST_TEE_7557, NULL)*/\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7558, NULL)\
-	/*ADBG_SUITE_ENTRY(XTEST_TEE_7559, NULL)*/\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7560, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7561, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7562, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7563, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7564, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7565, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7566, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7567, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7568, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7569, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7570, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7571, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7572, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7573, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7574, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7575, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7576, NULL)\
-	/*ADBG_SUITE_ENTRY(XTEST_TEE_7577, NULL)*/\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7578, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7579, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7580, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7581, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7582, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7583, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7584, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7585, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7586, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7587, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7588, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7589, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7590, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7591, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7592, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7593, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7594, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7595, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7596, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7597, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7598, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7599, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7600, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7601, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7602, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7603, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7604, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7605, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7606, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7607, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7608, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7609, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7610, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7611, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7612, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7613, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7614, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7615, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7616, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7617, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7618, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7619, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7620, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7621, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7622, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7623, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7624, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7625, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7626, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7627, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7628, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7629, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7630, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7631, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7632, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7633, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7634, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7635, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7636, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7637, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7638, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7639, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7640, NULL)\
-	/*ADBG_SUITE_ENTRY(XTEST_TEE_7641, NULL)*/\
-	/*ADBG_SUITE_ENTRY(XTEST_TEE_7642, NULL)*/\
-	/*ADBG_SUITE_ENTRY(XTEST_TEE_7643, NULL)*/\
-	/*ADBG_SUITE_ENTRY(XTEST_TEE_7644, NULL)*/\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7645, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7646, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7647, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7648, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7649, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7650, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7651, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7652, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7653, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7654, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7655, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7656, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7657, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7658, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7659, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7660, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7661, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7662, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7663, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7664, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7665, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7666, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7667, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7668, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7669, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7670, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7671, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7672, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7673, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7674, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7675, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7676, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7677, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7678, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7679, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7680, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7681, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7682, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7683, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7684, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7685, NULL)\
-	/*ADBG_SUITE_ENTRY(XTEST_TEE_7686, NULL)*/\
-	ADBG_SUITE_ENTRY(XTEST_TEE_7687, NULL)\
-	\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8001, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8002, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8003, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8004, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8005, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8006, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8007, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8008, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8009, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8010, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8011, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8012, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8013, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8014, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8015, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8016, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8017, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8018, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8019, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8020, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8021, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8022, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8023, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8024, NULL)\
-	/*ADBG_SUITE_ENTRY(XTEST_TEE_8025, NULL)*/\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8026, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8027, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8028, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8029, NULL)\
-	/*ADBG_SUITE_ENTRY(XTEST_TEE_8030, NULL)*/\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8031, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8032, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8033, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8034, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8035, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8036, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8037, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8038, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8039, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8040, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8041, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8042, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8043, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8044, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8045, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8046, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8047, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8048, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8049, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8050, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8051, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8052, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8053, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8054, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8055, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8056, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8057, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8058, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8059, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8060, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8061, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8062, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8063, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8064, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8065, NULL)\
-	/*ADBG_SUITE_ENTRY(XTEST_TEE_8066, NULL)*/\
-	\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8501, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8502, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8503, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8504, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8505, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8506, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8507, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8508, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8509, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8510, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8511, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8512, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8513, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8514, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8515, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8516, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8517, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8518, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8519, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8520, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8521, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8522, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8523, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8524, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8525, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8526, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8527, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8528, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8529, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8530, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8531, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8532, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8533, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8534, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8535, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8536, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8537, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8538, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8539, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8540, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8541, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8542, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8543, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8544, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8545, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8546, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8547, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8548, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8549, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8550, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8551, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8552, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8553, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8554, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8555, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8556, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8557, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8558, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8559, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8560, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8561, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8562, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8563, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8564, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8565, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8566, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8567, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8568, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8569, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8570, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8571, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8572, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8573, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8574, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8575, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8576, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8577, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8578, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8579, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8580, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8581, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8582, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8583, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8584, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8585, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8586, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8587, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8588, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8589, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8590, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8591, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8592, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8593, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8594, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8595, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8596, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8597, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8598, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8599, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8600, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8601, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8602, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8603, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8604, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8605, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8606, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8607, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8608, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8609, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8610, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8611, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8612, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8613, NULL)\
-	/*ADBG_SUITE_ENTRY(XTEST_TEE_8614, NULL)*/\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8615, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8616, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8617, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8618, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8619, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8620, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8621, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8622, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8623, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8624, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8625, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8626, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8627, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8628, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8629, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8630, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8631, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8632, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8633, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8634, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8635, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8636, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8637, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8638, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8639, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8640, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8641, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8642, NULL)\
-	/*ADBG_SUITE_ENTRY(XTEST_TEE_8643, NULL)*/\
-	/*ADBG_SUITE_ENTRY(XTEST_TEE_8644, NULL)*/\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8645, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8646, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8647, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8648, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8649, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8650, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8651, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8652, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8653, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8654, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8655, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8656, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8657, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8658, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8659, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8660, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8661, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8662, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8663, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8664, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8665, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8666, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8667, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8668, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8669, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8670, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8671, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_8672, NULL)\
-	/*ADBG_SUITE_ENTRY(XTEST_TEE_8673, NULL)*/\
-	/*ADBG_SUITE_ENTRY(XTEST_TEE_8674, NULL)*/\
-	\
-	/*ADBG_SUITE_ENTRY(XTEST_TEE_9001, NULL)*/\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9002, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9003, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9004, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9005, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9006, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9007, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9008, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9009, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9010, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9011, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9012, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9013, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9014, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9015, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9016, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9017, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9018, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9019, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9020, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9021, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9022, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9023, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9024, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9025, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9026, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9027, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9028, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9029, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9030, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9031, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9032, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9033, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9034, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9035, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9036, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9037, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9038, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9039, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9040, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9041, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9042, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9043, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9044, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9045, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9046, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9047, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9048, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9049, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9050, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9051, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9052, NULL)\
-	/*ADBG_SUITE_ENTRY(XTEST_TEE_9053, NULL)*/\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9054, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9055, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9056, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9057, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9058, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9059, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9060, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9061, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9062, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9063, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9064, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9065, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9066, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9067, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9068, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9069, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9070, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9071, NULL)\
-	/*ADBG_SUITE_ENTRY(XTEST_TEE_9072, NULL)*/\
-	/*ADBG_SUITE_ENTRY(XTEST_TEE_9073, NULL)*/\
-	/*ADBG_SUITE_ENTRY(XTEST_TEE_9074, NULL)*/\
-	/*ADBG_SUITE_ENTRY(XTEST_TEE_9075, NULL)*/\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9076, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9077, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9078, NULL)\
-	/*ADBG_SUITE_ENTRY(XTEST_TEE_9079, NULL)*/\
-	/*ADBG_SUITE_ENTRY(XTEST_TEE_9080, NULL)*/\
-	/*ADBG_SUITE_ENTRY(XTEST_TEE_9081, NULL)*/\
-	/*ADBG_SUITE_ENTRY(XTEST_TEE_9082, NULL)*/\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9083, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9084, NULL)\
-	/*ADBG_SUITE_ENTRY(XTEST_TEE_9085, NULL)*/\
-	/*ADBG_SUITE_ENTRY(XTEST_TEE_9086, NULL)*/\
-	/*ADBG_SUITE_ENTRY(XTEST_TEE_9087, NULL)*/\
-	/*ADBG_SUITE_ENTRY(XTEST_TEE_9088, NULL)*/\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9089, NULL)\
-	/*ADBG_SUITE_ENTRY(XTEST_TEE_9090, NULL)*/\
-	/*ADBG_SUITE_ENTRY(XTEST_TEE_9091, NULL)*/\
-	/*ADBG_SUITE_ENTRY(XTEST_TEE_9092, NULL)*/\
-	/*ADBG_SUITE_ENTRY(XTEST_TEE_9093, NULL)*/\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9094, NULL)\
-	/*ADBG_SUITE_ENTRY(XTEST_TEE_9095, NULL)*/\
-	/*ADBG_SUITE_ENTRY(XTEST_TEE_9096, NULL)*/\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9097, NULL)\
-	/*ADBG_SUITE_ENTRY(XTEST_TEE_9098, NULL)*/\
-	/*ADBG_SUITE_ENTRY(XTEST_TEE_9099, NULL)*/\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9100, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9101, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9102, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9103, NULL)\
-	/*ADBG_SUITE_ENTRY(XTEST_TEE_9104, NULL)*/\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9105, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9106, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9107, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9108, NULL)\
-	/*ADBG_SUITE_ENTRY(XTEST_TEE_9109, NULL)*/\
-	/*ADBG_SUITE_ENTRY(XTEST_TEE_9110, NULL)*/\
-	/*ADBG_SUITE_ENTRY(XTEST_TEE_9111, NULL)*/\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9112, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9113, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9114, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9115, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9116, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9117, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9118, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9119, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9120, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9121, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9122, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9123, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9124, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9125, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9126, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9127, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9128, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9129, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9130, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9131, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9132, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9133, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9134, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9135, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9136, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9137, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9138, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9139, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9140, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9141, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9142, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9143, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9144, NULL)\
-	/*ADBG_SUITE_ENTRY(XTEST_TEE_9145, NULL)*/\
-	/*ADBG_SUITE_ENTRY(XTEST_TEE_9146, NULL)*/\
-	/*ADBG_SUITE_ENTRY(XTEST_TEE_9147, NULL)*/\
-	/*ADBG_SUITE_ENTRY(XTEST_TEE_9148, NULL)*/\
-	/*ADBG_SUITE_ENTRY(XTEST_TEE_9149, NULL)*/\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9150, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9151, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9152, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9153, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9154, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9155, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9156, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9157, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9158, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9159, NULL)\
-	/*ADBG_SUITE_ENTRY(XTEST_TEE_9160, NULL)*/\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9161, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9162, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9163, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9164, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9165, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9166, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9167, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9168, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9169, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9170, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9171, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9172, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9173, NULL)\
-	/*ADBG_SUITE_ENTRY(XTEST_TEE_9174, NULL)*/\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9175, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9176, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9177, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9178, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9179, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9180, NULL)\
-	/*ADBG_SUITE_ENTRY(XTEST_TEE_9181, NULL)*/\
-	/*ADBG_SUITE_ENTRY(XTEST_TEE_9182, NULL)*/\
-	/*ADBG_SUITE_ENTRY(XTEST_TEE_9183, NULL)*/\
-	/*ADBG_SUITE_ENTRY(XTEST_TEE_9184, NULL)*/\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9185, NULL)\
-	/*ADBG_SUITE_ENTRY(XTEST_TEE_9186, NULL)*/\
-	/*ADBG_SUITE_ENTRY(XTEST_TEE_9187, NULL)*/\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9188, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9189, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9190, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9191, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9192, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9193, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9194, NULL)\
-	/*ADBG_SUITE_ENTRY(XTEST_TEE_9195, NULL)*/\
-	/*ADBG_SUITE_ENTRY(XTEST_TEE_9196, NULL)*/\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9197, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9198, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9199, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9200, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9201, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9202, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9203, NULL)\
-	/*ADBG_SUITE_ENTRY(XTEST_TEE_9204, NULL)*/\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9205, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9206, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9207, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9208, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9209, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9210, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9211, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9212, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9213, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9214, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9215, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9216, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9217, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9218, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9219, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9220, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9221, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9222, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9223, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9224, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9225, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9226, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9227, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9228, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9229, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9230, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9231, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9232, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9233, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9234, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9235, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9236, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9237, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9238, NULL)\
-	/*ADBG_SUITE_ENTRY(XTEST_TEE_9239, NULL)*/\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9240, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9241, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9242, NULL)\
-	ADBG_SUITE_ENTRY(XTEST_TEE_9243, NULL)\
-
-/* end of entry declarations */
-
-#endif /*ADBG_ENTRY_DECLARE_H*/
diff --git a/host/xtest/xml/include/xml_crypto_api.h b/host/xtest/xml/include/xml_crypto_api.h
index 4ba95c6..db2739f 100644
--- a/host/xtest/xml/include/xml_crypto_api.h
+++ b/host/xtest/xml/include/xml_crypto_api.h
@@ -739,11 +739,12 @@
 	const size_t dgst_length, const size_t obj1_size,
 	const size_t obj2_size,
 	const size_t key_size, uint32_t key_usage,
-	bool two_keys, bool key_set, bool initialized)
+	bool flag_two_keys, bool flag_key_set, bool flag_initialized)
 {
 	TEEC_Result res;
 	TEEC_Operation op = TEEC_OPERATION_INITIALIZER;
 	uint32_t ret_orig;
+	uint32_t mask_handle_state = 0;
 
 	op.params[0].value.a = (uint32_t)*oph;
 	op.paramTypes = TEEC_PARAM_TYPES(TEEC_VALUE_INOUT, TEEC_VALUE_OUTPUT,
@@ -760,24 +761,99 @@
 		ADBG_EXPECT(c, op.params[2].value.b, key_size);
 		ADBG_EXPECT(c, op.params[3].value.a, key_usage);
 
-		if (two_keys && key_set && initialized) {
-			ADBG_EXPECT(c, op.params[3].value.b,
-				    0x00020000 | 0x00040000 | 0x00080000);
-		} else if (two_keys && key_set) {
-			ADBG_EXPECT(c, op.params[3].value.b,
-				    0x00020000 | 0x00040000);
-		} else if (two_keys && initialized) {
-			ADBG_EXPECT(c, op.params[3].value.b,
-				    0x00020000 | 0x00080000);
-		} else if (key_set && initialized) {
-			ADBG_EXPECT(c, op.params[3].value.b,
-				    0x00040000 | 0x00080000);
-		}
+		if (flag_two_keys)
+ 			mask_handle_state |= TEE_HANDLE_FLAG_EXPECT_TWO_KEYS;
+
+ 		if (flag_key_set)
+ 			mask_handle_state |= TEE_HANDLE_FLAG_KEY_SET;
+
+ 		if (flag_initialized)
+ 			mask_handle_state |= TEE_HANDLE_FLAG_INITIALIZED;
+
+		ADBG_EXPECT(c, op.params[3].value.b, mask_handle_state);
+
 	}
 
 	return res;
 }
 
+#ifdef CFG_GP_TESTSUITE_ENABLE
+/*CMD_GetOperationInfoMultiple*/
+static TEEC_Result Invoke_Crypto_GetOperationInfoMultiple(
+	ADBG_Case_t *c, TEEC_Session *s,
+	const uint32_t cmd_id, TEE_OperationHandle *oph, const uint32_t algo,
+	uint32_t op_class, TEE_OperationMode op_mod,
+	const size_t dgst_length, const size_t obj1_size,
+	const size_t obj2_size,
+	const size_t key_size, uint32_t key_usage, uint32_t key_exp,
+	bool flag_two_keys, bool flag_key_set, bool flag_initialized)
+{
+	TEEC_Result res;
+	TEEC_Operation op = TEEC_OPERATION_INITIALIZER;
+	uint32_t ret_orig;
+	uint32_t *obuf;
+	uint32_t obuf_size;
+	uint32_t i;
+	uint32_t key_num;
+	uint32_t mask_handle_state = 0;
+
+	/*
+	 * ouput buffer size computation:
+	 * number of key expected * nb key fields
+	 * + operationState + numberOfkeys
+	 * * nb of bytes
+	 */
+	obuf_size = ((key_exp * 2) + 2) * 4;
+	ALLOCATE_SHARED_MEMORY(CONTEXT01, SHARE_MEM01, obuf_size,
+			       TEEC_MEMREF_PARTIAL_OUTPUT)
+
+	op.params[0].value.a = (uint32_t)*oph;
+
+	SET_SHARED_MEMORY_OPERATION_PARAMETER(3, 0, SHARE_MEM01,
+					      SHARE_MEM01->size)
+
+	op.paramTypes = TEEC_PARAM_TYPES(TEEC_VALUE_INOUT, TEEC_VALUE_OUTPUT,
+					 TEEC_VALUE_OUTPUT, TEEC_MEMREF_PARTIAL_OUTPUT);
+
+	res = TEEC_InvokeCommand(s, cmd_id, &op, &ret_orig);
+
+	if (res == TEEC_SUCCESS) {
+		ADBG_EXPECT(c, op.params[0].value.a, algo);
+		ADBG_EXPECT(c, op.params[0].value.b, op_class);
+		ADBG_EXPECT(c, op.params[1].value.a, (uint32_t)op_mod);
+		ADBG_EXPECT(c, op.params[1].value.b, dgst_length);
+		ADBG_EXPECT(c, op.params[2].value.a, obj1_size + obj2_size);
+
+ 		if (flag_two_keys)
+ 			mask_handle_state |= TEE_HANDLE_FLAG_EXPECT_TWO_KEYS;
+
+ 		if (flag_key_set)
+ 			mask_handle_state |= TEE_HANDLE_FLAG_KEY_SET;
+
+ 		if (flag_initialized)
+ 			mask_handle_state |= TEE_HANDLE_FLAG_INITIALIZED;
+
+		ADBG_EXPECT(c, op.params[2].value.b, mask_handle_state);
+
+		obuf = (uint32_t *) op.params[3].memref.parent->buffer;
+		obuf++;
+		key_num = *obuf;
+
+		for(i = 0; i < key_num; i++) {
+			obuf++;
+			ADBG_EXPECT(c, *obuf, key_size);
+			obuf++;
+			ADBG_EXPECT(c, *obuf, key_usage);
+		}
+	}
+
+exit:
+	TEEC_ReleaseSharedMemory(SHARE_MEM01);
+
+	return res;
+}
+#endif
+
 /*CMD_ResetOperation*/
 static TEEC_Result Invoke_Crypto_ResetOperation(
 	ADBG_Case_t *c, TEEC_Session *s,
diff --git a/host/xtest/xtest_6000.c b/host/xtest/xtest_6000.c
index 14f9088..7646fae 100644
--- a/host/xtest/xtest_6000.c
+++ b/host/xtest/xtest_6000.c
@@ -22,6 +22,9 @@
 #include <ta_storage.h>
 #include <tee_api_defines.h>
 #include <tee_api_types.h>
+#ifdef CFG_GP_TESTSUITE_ENABLE
+#include <TTA_DS_protocol.h>
+#endif
 
 static uint8_t file_00[] = {
 	0x00, 0x6E, 0x04, 0x57, 0x08, 0xFB, 0x71, 0x96,
@@ -438,6 +441,162 @@
 	TEEC_CloseSession(&sess);
 }
 
+#ifdef CFG_GP_TESTSUITE_ENABLE
+static TEEC_Result ds_open_access_conf(TEEC_Session *sess)
+{
+    TEEC_Operation op;
+    uint32_t org;
+
+    op.paramTypes = TEEC_PARAM_TYPES(
+        TEEC_NONE, TEEC_NONE, TEEC_NONE, TEEC_NONE);
+
+    return TEEC_InvokeCommand(
+        sess, CMD_CreatePersistentObject_AccessConflict, &op, &org);
+}
+
+static TEEC_Result ds_res_obj_panic(TEEC_Session *sess)
+{
+    TEEC_Operation op;
+    uint32_t org;
+
+    op.paramTypes = TEEC_PARAM_TYPES(
+        TEEC_NONE, TEEC_NONE, TEEC_NONE, TEEC_NONE);
+
+    return TEEC_InvokeCommand(
+        sess, CMD_RestrictObjectUsagePanic, &op, &org);
+}
+
+static TEEC_Result ds_seek_obj_inv_handle(TEEC_Session *sess)
+{
+    TEEC_Operation op;
+    uint32_t org;
+
+    op.paramTypes = TEEC_PARAM_TYPES(
+        TEEC_VALUE_INPUT, TEEC_NONE, TEEC_NONE, TEEC_NONE);
+
+    op.params[0].value.a = CASE_DATA_OBJECT_NOT_PERSISTENT;
+
+    return TEEC_InvokeCommand(
+        sess, CMD_SeekObjectData_panic, &op, &org);
+}
+
+static TEEC_Result ds_seek_obj_bad_handle(TEEC_Session *sess)
+{
+    TEEC_Operation op;
+    uint32_t org;
+
+    op.paramTypes = TEEC_PARAM_TYPES(
+        TEEC_VALUE_INPUT, TEEC_NONE, TEEC_NONE, TEEC_NONE);
+
+    op.params[0].value.a = CASE_DATA_BAD_HANDLE;
+
+    return TEEC_InvokeCommand(
+        sess, CMD_SeekObjectData_panic, &op, &org);
+}
+
+static TEEC_Result ds_seek_gp(
+    TEEC_Session *sess, TEE_Whence wh, uint32_t wh_off, uint32_t set_off,
+    void *in, size_t in_size, void *out, size_t out_size)
+{
+    TEEC_Operation op;
+    uint32_t org;
+
+    op.paramTypes = TEEC_PARAM_TYPES(
+        TEEC_VALUE_INPUT, TEEC_VALUE_INPUT, TEEC_MEMREF_TEMP_INPUT,
+        TEEC_MEMREF_TEMP_OUTPUT);
+
+    op.params[0].value.a = wh;
+    op.params[0].value.b = wh_off;
+    op.params[1].value.a = set_off;
+    op.params[2].tmpref.buffer = in;
+    op.params[2].tmpref.size = in_size;
+    op.params[3].tmpref.buffer = out;
+    op.params[3].tmpref.size = out_size;
+
+    return TEEC_InvokeCommand(sess, CMD_SeekWriteReadObjectData, &op, &org);
+}
+
+static TEEC_Result ds_init_object_and_attributes(TEEC_Session *sess,
+            uint32_t obj_type, uint32_t obj_size, const void *attr_meta,
+            size_t attr_meta_len, const void *attr_data, size_t attr_data_len,
+            uint32_t option)
+{
+    TEEC_Operation op;
+    uint32_t org;
+
+    op.paramTypes = TEEC_PARAM_TYPES(
+        TEEC_VALUE_INPUT, TEEC_MEMREF_TEMP_INPUT,
+        TEEC_MEMREF_TEMP_INPUT, TEEC_VALUE_INPUT);
+
+    op.params[0].value.a = obj_type;
+    op.params[0].value.b = obj_size;
+    op.params[1].tmpref.buffer = (void *)attr_meta;
+    op.params[1].tmpref.size = attr_meta_len;
+    op.params[2].tmpref.buffer = (void *)attr_data;
+    op.params[2].tmpref.size = attr_data_len;
+    op.params[3].value.a = option;
+
+    return TEEC_InvokeCommand(sess, CMD_InitObjectAndAttributes, &op, &org);
+}
+
+static TEEC_Result ds_rename_access_conflict(TEEC_Session *sess)
+{
+    TEEC_Operation op;
+    uint32_t org;
+
+    op.paramTypes = TEEC_PARAM_TYPES(
+        TEEC_NONE, TEEC_NONE, TEEC_NONE, TEEC_NONE);
+
+    return TEEC_InvokeCommand(
+        sess, CMD_RenamePersistentObject_AccessConflict, &op, &org);
+}
+
+static TEEC_Result ds_start_enum_no_item(TEEC_Session *sess)
+{
+    TEEC_Operation op;
+    uint32_t org;
+    TEEC_Result res;
+
+    op.paramTypes = TEEC_PARAM_TYPES(
+        TEEC_VALUE_OUTPUT, TEEC_NONE, TEEC_NONE, TEEC_NONE);
+
+    res = TEEC_InvokeCommand(
+        sess, CMD_StartNGetPersistentObjectEnumerator_itemNotFound, &op, &org);
+
+    if (res != TEEC_SUCCESS)
+        return res;
+
+    if (op.params[0].value.a != 0 || op.params[0].value.b != 0)
+        return TEEC_ERROR_GENERIC;
+
+    return res;
+}
+
+static TEEC_Result ds_rename_success(TEEC_Session *sess)
+{
+    TEEC_Operation op;
+    uint32_t org;
+
+    op.paramTypes = TEEC_PARAM_TYPES(
+        TEEC_NONE, TEEC_NONE, TEEC_NONE, TEEC_NONE);
+
+    return TEEC_InvokeCommand(
+        sess, CMD_RenamePersistentObject_Success, &op, &org);
+}
+
+static TEEC_Result ds_null_close_free_reset(TEEC_Session *sess)
+{
+    TEEC_Operation op;
+    uint32_t org;
+
+    op.paramTypes = TEEC_PARAM_TYPES(
+        TEEC_NONE, TEEC_NONE, TEEC_NONE, TEEC_NONE);
+
+    return TEEC_InvokeCommand(
+        sess, CMD_CloseFreeAndResetObjectSuccessHandleNull, &op, &org);
+}
+#endif
+
 /* create */
 static void xtest_tee_test_6001(ADBG_Case_t *c)
 {
@@ -856,6 +1015,169 @@
 	TEEC_CloseSession(&sess);
 }
 
+#ifdef CFG_GP_TESTSUITE_ENABLE
+static void xtest_tee_test_6010(ADBG_Case_t *c)
+{
+    TEEC_Session sess;
+    uint32_t orig;
+    uint8_t out[4000] = {0};
+    uint8_t in[0x12c] = {'b'};
+
+    if (!ADBG_EXPECT_TEEC_SUCCESS(
+            c, xtest_teec_open_session(
+                &sess, &gp_tta_ds_uuid, NULL, &orig)))
+        return;
+
+    Do_ADBG_BeginSubCase(
+        c, "GP DS CreatePersistentObject AccessConflict (9d-1d-62)");
+
+    if (!ADBG_EXPECT_TEEC_RESULT(
+            c, TEEC_ERROR_ACCESS_CONFLICT, ds_open_access_conf(&sess)))
+        goto exit;
+
+    Do_ADBG_EndSubCase(
+        c, "GP DS CreatePersistentObject AccessConflict (9d-1d-62)");
+    Do_ADBG_BeginSubCase(
+        c, "GP DS RestrictObjectUsagePanic (9d-5d-46)");
+
+    if (!ADBG_EXPECT_TEEC_RESULT(
+            c, TEE_ERROR_TARGET_DEAD, ds_res_obj_panic(&sess)))
+        goto exit;
+
+    TEEC_CloseSession(&sess);
+
+    Do_ADBG_EndSubCase(
+        c, "GP DS RestrictObjectUsagePanic (9d-5d-46)");
+    Do_ADBG_BeginSubCase(
+        c, "GP DS SeekObjectData BadHandle (9d-c3-c8)");
+
+    if (!ADBG_EXPECT_TEEC_SUCCESS(
+            c, xtest_teec_open_session(
+                &sess, &gp_tta_ds_uuid, NULL, &orig)))
+        return;
+
+    if (!ADBG_EXPECT_TEEC_RESULT(
+            c, TEE_ERROR_TARGET_DEAD, ds_seek_obj_bad_handle(&sess)))
+        goto exit;
+
+    TEEC_CloseSession(&sess);
+
+    Do_ADBG_EndSubCase(
+        c, "GP DS SeekObjectData BadHandle (9d-c3-c8)");
+    Do_ADBG_BeginSubCase(
+        c, "GP DS SeekObjectData NotPersist (9d-db-4a)");
+
+    if (!ADBG_EXPECT_TEEC_SUCCESS(
+            c, xtest_teec_open_session(
+                &sess, &gp_tta_ds_uuid, NULL, &orig)))
+        return;
+
+    if (!ADBG_EXPECT_TEEC_RESULT(
+            c, TEE_ERROR_TARGET_DEAD, ds_seek_obj_inv_handle(&sess)))
+        goto exit;
+
+    TEEC_CloseSession(&sess);
+
+    Do_ADBG_EndSubCase(
+        c, "GP DS SeekObjectData NotPersist (9d-db-4a)");
+    Do_ADBG_BeginSubCase(c, "GP DS SeekWriteRead SEEK_END (9d-e4-58)");
+
+    if (!ADBG_EXPECT_TEEC_SUCCESS(
+            c, xtest_teec_open_session(
+                &sess, &gp_tta_ds_uuid, NULL, &orig)))
+        return;
+
+    if (!ADBG_EXPECT_TEEC_SUCCESS(
+            c, ds_seek_gp(
+                &sess, TEE_DATA_SEEK_END, 0, 2, data_00, sizeof(data_00), out,
+                sizeof(out))))
+        goto exit;
+
+    /* check buffer */
+    (void)ADBG_EXPECT_BUFFER(
+        c, data_00, sizeof(data_00), out, sizeof(data_00));
+
+    if (!ADBG_EXPECT_TEEC_SUCCESS(
+            c, ds_seek_gp(
+                &sess, TEE_DATA_SEEK_END, sizeof(in), 0, in, sizeof(in), out,
+                sizeof(out))))
+        goto exit;
+
+    (void)ADBG_EXPECT_BUFFER(c, in + sizeof(in), sizeof(in), out, sizeof(in));
+
+    Do_ADBG_EndSubCase(c, "GP DS SeekWriteRead SEEK_END (9d-e4-58)");
+    Do_ADBG_BeginSubCase(c, "GP DS Rename Access Conflict (9d-29-d1)");
+
+    if (!ADBG_EXPECT_TEEC_RESULT(
+            c, TEE_ERROR_ACCESS_CONFLICT, ds_rename_access_conflict(&sess)))
+        goto exit;
+
+    Do_ADBG_EndSubCase(c, "GP DS Rename Access Conflict (9d-29-d1)");
+    Do_ADBG_BeginSubCase(
+        c, "GP DS StartPersistentObjectEnumerator ItemNotFound (9d-52-ec)");
+
+    if (!ADBG_EXPECT_TEEC_SUCCESS(c, ds_start_enum_no_item(&sess)))
+        goto exit;
+
+    Do_ADBG_EndSubCase(
+        c, "GP DS StartPersistentObjectEnumerator ItemNotFound (9d-52-ec)");
+    Do_ADBG_BeginSubCase(
+        c, "GP DS RenamePersistent ReadWrite (9d-19-88)");
+
+    if (!ADBG_EXPECT_TEEC_SUCCESS(c, ds_rename_success(&sess)))
+        goto exit;
+
+    Do_ADBG_EndSubCase(
+        c, "GP DS RenamePersistent ReadWrite (9d-19-88)");
+    Do_ADBG_BeginSubCase(
+        c, "GP DS Close Free Reset Null (9d-6d-87)");
+
+    if (!ADBG_EXPECT_TEEC_SUCCESS(c, ds_null_close_free_reset(&sess)))
+        goto exit;
+
+    Do_ADBG_EndSubCase(
+        c, "GP DS Close Free Reset Null (9d-6d-87)");
+
+exit:
+    TEEC_CloseSession(&sess);
+}
+
+static void xtest_tee_test_6011(ADBG_Case_t *c)
+{
+    TEEC_Session sess;
+    uint32_t orig;
+    /*
+     * Test data from
+     * Invoke_InitObjectAndAttributes_TEE_TYPE_AES_success_attribute_
+     * TEE_ATTR_SECRET_VALUE_correct_size (9d-9a-91)
+     */
+    static const uint8_t attr_meta[] = {
+0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x00,
+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+    };
+    static const uint8_t attr_data[] = {
+0x60,0x3d,0xeb,0x10,0x15,0xca,0x71,0xbe,0x2b,0x73,0xae,0xf0,0x85,0x7d,0x77,
+0x81,0x1f,0x35,0x2c,0x07,0x3b,0x61,0x08,0xd7,0x2d,0x98,0x10,0xa3,0x09,0x14,
+0xdf,0xf4,
+    };
+
+    if (!ADBG_EXPECT_TEEC_SUCCESS(
+            c, xtest_teec_open_session(
+                &sess, &gp_tta_ds_uuid, NULL, &orig)))
+        return;
+
+    if (!ADBG_EXPECT_TEEC_SUCCESS(c, ds_init_object_and_attributes(&sess,
+            0xa0000010, 0x100, attr_meta, sizeof(attr_meta), attr_data,
+            sizeof(attr_data), 0)))
+        goto exit;
+
+exit:
+    TEEC_CloseSession(&sess);
+}
+#endif
+
 ADBG_CASE_DEFINE(
 	XTEST_TEE_6001, xtest_tee_test_6001,
 	/* Title */
@@ -963,3 +1285,29 @@
 	/* How to implement */
 	"Description of how to implement ..."
 	);
+
+#ifdef CFG_GP_TESTSUITE_ENABLE
+ADBG_CASE_DEFINE(
+    XTEST_TEE_6010, xtest_tee_test_6010,
+    /* Title */
+    "Test TEE GP TTA DS storage",
+    /* Short description */
+    "Short description ...",
+    /* Requirement IDs */
+    "TEE-??",
+    /* How to implement */
+    "Description of how to implement ..."
+);
+
+ADBG_CASE_DEFINE(
+    XTEST_TEE_6011, xtest_tee_test_6011,
+    /* Title */
+    "Test TEE GP TTA DS init objects",
+    /* Short description */
+    "Short description ...",
+    /* Requirement IDs */
+    "TEE-??",
+    /* How to implement */
+    "Description of how to implement ..."
+);
+#endif
diff --git a/host/xtest/xtest_main.c b/host/xtest/xtest_main.c
index 6cb70f4..19a1c82 100644
--- a/host/xtest/xtest_main.c
+++ b/host/xtest/xtest_main.c
@@ -17,7 +17,9 @@
 #include <adbg.h>
 #include "xtest_test.h"
 #include "xtest_helpers.h"
+#ifdef CFG_GP_TESTSUITE_ENABLE
 #include "adbg_entry_declare.h"
+#endif
 
 ADBG_SUITE_DECLARE(XTEST_TEE_TEST)
 
@@ -54,6 +56,9 @@
 ADBG_SUITE_ENTRY(XTEST_TEE_6007, NULL)
 ADBG_SUITE_ENTRY(XTEST_TEE_6008, NULL)
 ADBG_SUITE_ENTRY(XTEST_TEE_6009, NULL)
+#ifdef CFG_GP_TESTSUITE_ENABLE
+ADBG_SUITE_ENTRY(XTEST_TEE_6011, NULL)
+#endif
 ADBG_SUITE_ENTRY(XTEST_TEE_7001, NULL)
 /* FVP    ADBG_SUITE_ENTRY(XTEST_TEE_7002, NULL) */
 ADBG_SUITE_ENTRY(XTEST_TEE_7003, NULL)
diff --git a/host/xtest/xtest_test.c b/host/xtest/xtest_test.c
index 8fae19b..85f16cd 100644
--- a/host/xtest/xtest_test.c
+++ b/host/xtest/xtest_test.c
@@ -21,6 +21,10 @@
 #include <ta_storage.h>
 #include <enc_fs_key_manager_test.h>
 #include <tee_api_defines.h>
+#ifdef CFG_GP_TESTSUITE_ENABLE
+#include <tee_api_types.h>
+#include <TTA_DS_protocol.h>
+#endif
 
 ADBG_ENUM_TABLE_DEFINE_BEGIN(TEEC_Result)
 ADBG_ENUM_TABLE_ENTRY(TEEC_SUCCESS),
@@ -74,4 +78,6 @@
 const TEEC_UUID sims_test_ta_uuid = TA_SIMS_TEST_UUID;
 const TEEC_UUID storage_ta_uuid = TA_STORAGE_UUID;
 const TEEC_UUID enc_fs_key_manager_test_ta_uuid = ENC_FS_KEY_MANAGER_TEST_UUID;
-
+#ifdef CFG_GP_TESTSUITE_ENABLE
+const TEEC_UUID gp_tta_ds_uuid = TA_TTA_DS_UUID;
+#endif
diff --git a/host/xtest/xtest_test.h b/host/xtest/xtest_test.h
index 95598a0..7e2eed8 100644
--- a/host/xtest/xtest_test.h
+++ b/host/xtest/xtest_test.h
@@ -15,7 +15,6 @@
 #define XTEST_TEST_H
 #include <adbg.h>
 #include <tee_client_api.h>
-#include "adbg_case_declare.h"
 
 /*ADBG Cases declaration.*/
 ADBG_CASE_DECLARE(XTEST_TEE_1001);
@@ -54,6 +53,9 @@
 ADBG_CASE_DECLARE(XTEST_TEE_6007);
 ADBG_CASE_DECLARE(XTEST_TEE_6008);
 ADBG_CASE_DECLARE(XTEST_TEE_6009);
+#ifdef CFG_GP_TESTSUITE_ENABLE
+ADBG_CASE_DECLARE(XTEST_TEE_6011);
+#endif
 ADBG_CASE_DECLARE(XTEST_TEE_7001);
 ADBG_CASE_DECLARE(XTEST_TEE_7002);
 ADBG_CASE_DECLARE(XTEST_TEE_7003);
@@ -73,7 +75,10 @@
 ADBG_CASE_DECLARE(XTEST_TEE_10001);
 ADBG_CASE_DECLARE(XTEST_TEE_10002);
 
+#ifdef CFG_GP_TESTSUITE_ENABLE
+#include "adbg_case_declare.h"
 ADBG_CASE_DECLARE_AUTO_GENERATED_TESTS()
+#endif
 
 /* TEEC_Result */
 ADBG_ENUM_TABLE_DECLARE(TEEC_Result);