diff --git a/rosapps/tests/button2/accelerator.xml b/rosapps/tests/button2/button2.xml
similarity index 100%
rename from rosapps/tests/button2/accelerator.xml
rename to rosapps/tests/button2/button2.xml
diff --git a/rosapps/tests/combo/combotst.c b/rosapps/tests/combotst/combotst.c
similarity index 100%
rename from rosapps/tests/combo/combotst.c
rename to rosapps/tests/combotst/combotst.c
diff --git a/rosapps/tests/combo/combotst.xml b/rosapps/tests/combotst/combotst.xml
similarity index 100%
rename from rosapps/tests/combo/combotst.xml
rename to rosapps/tests/combotst/combotst.xml
diff --git a/rosapps/tests/combo/utils.c b/rosapps/tests/combotst/utils.c
similarity index 100%
rename from rosapps/tests/combo/utils.c
rename to rosapps/tests/combotst/utils.c
diff --git a/rosapps/tests/combo/utils.h b/rosapps/tests/combotst/utils.h
similarity index 100%
rename from rosapps/tests/combo/utils.h
rename to rosapps/tests/combotst/utils.h
diff --git a/rosapps/tests/directory.xml b/rosapps/tests/directory.xml
index 38e2606a3f3..4fe353f0f67 100644
--- a/rosapps/tests/directory.xml
+++ b/rosapps/tests/directory.xml
@@ -10,3 +10,269 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/rosapps/tests/fiber/fiber.xml b/rosapps/tests/fiber/fiber.xml
index 17b0e78a5ce..a9daa8206ea 100644
--- a/rosapps/tests/fiber/fiber.xml
+++ b/rosapps/tests/fiber/fiber.xml
@@ -1,4 +1,4 @@
-
+
0x0501
0x0501
@@ -6,5 +6,5 @@
kernel32
gdi32
- alphablend.c
+ fiber.c
\ No newline at end of file
diff --git a/rosapps/tests/lan/lantest.cpp b/rosapps/tests/lantst/lantest.cpp
similarity index 100%
rename from rosapps/tests/lan/lantest.cpp
rename to rosapps/tests/lantst/lantest.cpp
diff --git a/rosapps/tests/lan/lantest.xml b/rosapps/tests/lantst/lantest.xml
similarity index 100%
rename from rosapps/tests/lan/lantest.xml
rename to rosapps/tests/lantst/lantest.xml
diff --git a/rosapps/tests/lpc/conport.c b/rosapps/tests/lpctst/conport.c
similarity index 100%
rename from rosapps/tests/lpc/conport.c
rename to rosapps/tests/lpctst/conport.c
diff --git a/rosapps/tests/lpc/creport.c b/rosapps/tests/lpctst/creport.c
similarity index 100%
rename from rosapps/tests/lpc/creport.c
rename to rosapps/tests/lpctst/creport.c
diff --git a/rosapps/tests/lpc/dumpinfo.c b/rosapps/tests/lpctst/dumpinfo.c
similarity index 100%
rename from rosapps/tests/lpc/dumpinfo.c
rename to rosapps/tests/lpctst/dumpinfo.c
diff --git a/rosapps/tests/lpc/dumpinfo.h b/rosapps/tests/lpctst/dumpinfo.h
similarity index 100%
rename from rosapps/tests/lpc/dumpinfo.h
rename to rosapps/tests/lpctst/dumpinfo.h
diff --git a/rosapps/tests/lpc/lpcclt.c b/rosapps/tests/lpctst/lpcclt.c
similarity index 100%
rename from rosapps/tests/lpc/lpcclt.c
rename to rosapps/tests/lpctst/lpcclt.c
diff --git a/rosapps/tests/lpc/lpcsrv.c b/rosapps/tests/lpctst/lpcsrv.c
similarity index 100%
rename from rosapps/tests/lpc/lpcsrv.c
rename to rosapps/tests/lpctst/lpcsrv.c
diff --git a/rosapps/tests/lpc/lpctest.h b/rosapps/tests/lpctst/lpctest.h
similarity index 100%
rename from rosapps/tests/lpc/lpctest.h
rename to rosapps/tests/lpctst/lpctest.h
diff --git a/rosapps/tests/lpc/lpctst.xml b/rosapps/tests/lpctst/lpctst.xml
similarity index 100%
rename from rosapps/tests/lpc/lpctst.xml
rename to rosapps/tests/lpctst/lpctst.xml
diff --git a/rosapps/tests/wclickat/wclickat.xml b/rosapps/tests/wclickat/wclickat.xml
new file mode 100644
index 00000000000..17b0e78a5ce
--- /dev/null
+++ b/rosapps/tests/wclickat/wclickat.xml
@@ -0,0 +1,10 @@
+
+ 0x0501
+ 0x0501
+
+
+ kernel32
+ gdi32
+
+ alphablend.c
+
\ No newline at end of file
diff --git a/rosapps/tests/wpickclick/wpickclick.xml b/rosapps/tests/wpickclick/wpickclick.xml
new file mode 100644
index 00000000000..17b0e78a5ce
--- /dev/null
+++ b/rosapps/tests/wpickclick/wpickclick.xml
@@ -0,0 +1,10 @@
+
+ 0x0501
+ 0x0501
+
+
+ kernel32
+ gdi32
+
+ alphablend.c
+
\ No newline at end of file