Remove files used by old unit test runner.

145 files changed, 0 insertions, 155 deletions

diff --git a/searchcore/src/tests/fdispatch/fnet_search/DESC b/searchcore/src/tests/fdispatch/fnet_search/DESC
deleted file mode 100644
index 4bc24883896..00000000000
--- a/searchcore/src/tests/fdispatch/fnet_search/DESC
+++ /dev/null
@@ -1 +0,0 @@
-search_path test. Take a look at search_path_test.cpp for details.
diff --git a/searchcore/src/tests/fdispatch/fnet_search/FILES b/searchcore/src/tests/fdispatch/fnet_search/FILES
deleted file mode 100644
index a38e13c26fd..00000000000
--- a/searchcore/src/tests/fdispatch/fnet_search/FILES
+++ /dev/null
@@ -1 +0,0 @@
-search_path_test.cpp
diff --git a/searchcore/src/tests/fdispatch/randomrow/DESC b/searchcore/src/tests/fdispatch/randomrow/DESC
deleted file mode 100644
index 86d8eecd44c..00000000000
--- a/searchcore/src/tests/fdispatch/randomrow/DESC
+++ /dev/null
@@ -1 +0,0 @@
-randomrow test. Take a look at randomrow_test.cpp for details.
diff --git a/searchcore/src/tests/fdispatch/randomrow/FILES b/searchcore/src/tests/fdispatch/randomrow/FILES
deleted file mode 100644
index 2f15498219f..00000000000
--- a/searchcore/src/tests/fdispatch/randomrow/FILES
+++ /dev/null
@@ -1 +0,0 @@
-randomrow_test.cpp
diff --git a/searchcore/src/tests/grouping/DESC b/searchcore/src/tests/grouping/DESC
deleted file mode 100644
index 1aa6cb37e89..00000000000
--- a/searchcore/src/tests/grouping/DESC
+++ /dev/null
@@ -1 +0,0 @@
-grouping test. Take a look at grouping.cpp for details.
diff --git a/searchcore/src/tests/grouping/FILES b/searchcore/src/tests/grouping/FILES
deleted file mode 100644
index a3a45cfb198..00000000000
--- a/searchcore/src/tests/grouping/FILES
+++ /dev/null
@@ -1 +0,0 @@
-grouping.cpp
diff --git a/searchcore/src/tests/proton/attribute/DESC b/searchcore/src/tests/proton/attribute/DESC
deleted file mode 100644
index bd71a808c51..00000000000
--- a/searchcore/src/tests/proton/attribute/DESC
+++ /dev/null
@@ -1 +0,0 @@
-attribute test. Take a look at attribute.cpp for details.
diff --git a/searchcore/src/tests/proton/attribute/FILES b/searchcore/src/tests/proton/attribute/FILES
deleted file mode 100644
index 84bc710d58b..00000000000
--- a/searchcore/src/tests/proton/attribute/FILES
+++ /dev/null
@@ -1 +0,0 @@
-attribute.cpp
diff --git a/searchcore/src/tests/proton/attribute/attribute_aspect_delayer/DESC b/searchcore/src/tests/proton/attribute/attribute_aspect_delayer/DESC
deleted file mode 100644
index 0ad2e46da02..00000000000
--- a/searchcore/src/tests/proton/attribute/attribute_aspect_delayer/DESC
+++ /dev/null
@@ -1 +0,0 @@
-attribute aspect delayer test. Take a look at attribute_aspect_delayer_test.cpp for details.
diff --git a/searchcore/src/tests/proton/attribute/attribute_aspect_delayer/FILES b/searchcore/src/tests/proton/attribute/attribute_aspect_delayer/FILES
deleted file mode 100644
index 459c36ca3b4..00000000000
--- a/searchcore/src/tests/proton/attribute/attribute_aspect_delayer/FILES
+++ /dev/null
@@ -1 +0,0 @@
-attribute_aspect_delayer_test.cpp
diff --git a/searchcore/src/tests/proton/attribute/attribute_directory/DESC b/searchcore/src/tests/proton/attribute/attribute_directory/DESC
deleted file mode 100644
index f529e4ac5e4..00000000000
--- a/searchcore/src/tests/proton/attribute/attribute_directory/DESC
+++ /dev/null
@@ -1 +0,0 @@
-AttributeDirectory test. Take a look at attribute_directory_test.cpp for details.
diff --git a/searchcore/src/tests/proton/attribute/attribute_directory/FILES b/searchcore/src/tests/proton/attribute/attribute_directory/FILES
deleted file mode 100644
index fccd4ba135a..00000000000
--- a/searchcore/src/tests/proton/attribute/attribute_directory/FILES
+++ /dev/null
@@ -1 +0,0 @@
-attribute_directory_test.cpp
diff --git a/searchcore/src/tests/proton/attribute/attribute_initializer/DESC b/searchcore/src/tests/proton/attribute/attribute_initializer/DESC
deleted file mode 100644
index d7e2c61d85d..00000000000
--- a/searchcore/src/tests/proton/attribute/attribute_initializer/DESC
+++ /dev/null
@@ -1 +0,0 @@
-attribute initializer test. Take a look at attribute_initializer_test.cpp for details.
diff --git a/searchcore/src/tests/proton/attribute/attribute_initializer/FILES b/searchcore/src/tests/proton/attribute/attribute_initializer/FILES
deleted file mode 100644
index cedbcb0155b..00000000000
--- a/searchcore/src/tests/proton/attribute/attribute_initializer/FILES
+++ /dev/null
@@ -1 +0,0 @@
-attribute_initializer_test.cpp
diff --git a/searchcore/src/tests/proton/attribute/attribute_manager/DESC b/searchcore/src/tests/proton/attribute/attribute_manager/DESC
deleted file mode 100644
index f1cdc01fd47..00000000000
--- a/searchcore/src/tests/proton/attribute/attribute_manager/DESC
+++ /dev/null
@@ -1 +0,0 @@
-attribute manager test. Take a look at attribute_manager_test.cpp for details.
diff --git a/searchcore/src/tests/proton/attribute/attribute_manager/FILES b/searchcore/src/tests/proton/attribute/attribute_manager/FILES
deleted file mode 100644
index 8e4fbdcb888..00000000000
--- a/searchcore/src/tests/proton/attribute/attribute_manager/FILES
+++ /dev/null
@@ -1 +0,0 @@
-attribute_manager_test.cpp
diff --git a/searchcore/src/tests/proton/attribute/attribute_populator/DESC b/searchcore/src/tests/proton/attribute/attribute_populator/DESC
deleted file mode 100644
index 5ef9dcb2709..00000000000
--- a/searchcore/src/tests/proton/attribute/attribute_populator/DESC
+++ /dev/null
@@ -1 +0,0 @@
-attribute_populator test. Take a look at attribute_populator_test.cpp for details.
diff --git a/searchcore/src/tests/proton/attribute/attribute_populator/FILES b/searchcore/src/tests/proton/attribute/attribute_populator/FILES
deleted file mode 100644
index b6bf0bf8458..00000000000
--- a/searchcore/src/tests/proton/attribute/attribute_populator/FILES
+++ /dev/null
@@ -1 +0,0 @@
-attribute_populator_test.cpp
diff --git a/searchcore/src/tests/proton/attribute/attribute_usage_filter/DESC b/searchcore/src/tests/proton/attribute/attribute_usage_filter/DESC
deleted file mode 100644
index 31b3afbcdf7..00000000000
--- a/searchcore/src/tests/proton/attribute/attribute_usage_filter/DESC
+++ /dev/null
@@ -1 +0,0 @@
-AttributeUsageFilter test. Take a look at attribute_usage_filter_test.cpp for details.
diff --git a/searchcore/src/tests/proton/attribute/attribute_usage_filter/FILES b/searchcore/src/tests/proton/attribute/attribute_usage_filter/FILES
deleted file mode 100644
index b63aeb79d02..00000000000
--- a/searchcore/src/tests/proton/attribute/attribute_usage_filter/FILES
+++ /dev/null
@@ -1 +0,0 @@
-attribute_usage_filter_test.cpp
diff --git a/searchcore/src/tests/proton/attribute/attributes_state_explorer/DESC b/searchcore/src/tests/proton/attribute/attributes_state_explorer/DESC
deleted file mode 100644
index 1459d32ddae..00000000000
--- a/searchcore/src/tests/proton/attribute/attributes_state_explorer/DESC
+++ /dev/null
@@ -1 +0,0 @@
-attributes_state_explorer test. Take a look at attributes_state_explorer_test.cpp for details.
diff --git a/searchcore/src/tests/proton/attribute/attributes_state_explorer/FILES b/searchcore/src/tests/proton/attribute/attributes_state_explorer/FILES
deleted file mode 100644
index f49eb2b8e86..00000000000
--- a/searchcore/src/tests/proton/attribute/attributes_state_explorer/FILES
+++ /dev/null
@@ -1 +0,0 @@
-attributes_state_explorer_test.cpp
diff --git a/searchcore/src/tests/proton/attribute/document_field_populator/DESC b/searchcore/src/tests/proton/attribute/document_field_populator/DESC
deleted file mode 100644
index cdc71250210..00000000000
--- a/searchcore/src/tests/proton/attribute/document_field_populator/DESC
+++ /dev/null
@@ -1 +0,0 @@
-document_field_populator test. Take a look at document_field_populator_test.cpp for details.
diff --git a/searchcore/src/tests/proton/attribute/document_field_populator/FILES b/searchcore/src/tests/proton/attribute/document_field_populator/FILES
deleted file mode 100644
index 21f62452acf..00000000000
--- a/searchcore/src/tests/proton/attribute/document_field_populator/FILES
+++ /dev/null
@@ -1 +0,0 @@
-document_field_populator_test.cpp
diff --git a/searchcore/src/tests/proton/attribute/exclusive_attribute_read_accessor/DESC b/searchcore/src/tests/proton/attribute/exclusive_attribute_read_accessor/DESC
deleted file mode 100644
index ec5a407ddbd..00000000000
--- a/searchcore/src/tests/proton/attribute/exclusive_attribute_read_accessor/DESC
+++ /dev/null
@@ -1 +0,0 @@
-exclusive_attribute_read_accessor test. Take a look at exclusive_attribute_read_accessor_test.cpp for details.
diff --git a/searchcore/src/tests/proton/attribute/exclusive_attribute_read_accessor/FILES b/searchcore/src/tests/proton/attribute/exclusive_attribute_read_accessor/FILES
deleted file mode 100644
index 74a9ab77547..00000000000
--- a/searchcore/src/tests/proton/attribute/exclusive_attribute_read_accessor/FILES
+++ /dev/null
@@ -1 +0,0 @@
-exclusive_attribute_read_accessor_test.cpp
diff --git a/searchcore/src/tests/proton/attribute/imported_attributes_context/DESC b/searchcore/src/tests/proton/attribute/imported_attributes_context/DESC
deleted file mode 100644
index 02050ecaf20..00000000000
--- a/searchcore/src/tests/proton/attribute/imported_attributes_context/DESC
+++ /dev/null
@@ -1 +0,0 @@
-imported_attributes_context test. Take a look at imported_attributes_context_test.cpp for details.
diff --git a/searchcore/src/tests/proton/attribute/imported_attributes_context/FILES b/searchcore/src/tests/proton/attribute/imported_attributes_context/FILES
deleted file mode 100644
index 6ff2c1b61f6..00000000000
--- a/searchcore/src/tests/proton/attribute/imported_attributes_context/FILES
+++ /dev/null
@@ -1 +0,0 @@
-imported_attributes_context_test.cpp
diff --git a/searchcore/src/tests/proton/attribute/imported_attributes_repo/DESC b/searchcore/src/tests/proton/attribute/imported_attributes_repo/DESC
deleted file mode 100644
index 7d312b1df98..00000000000
--- a/searchcore/src/tests/proton/attribute/imported_attributes_repo/DESC
+++ /dev/null
@@ -1 +0,0 @@
-imported_attributes_repo test. Take a look at imported_attributes_repo_test.cpp for details.
diff --git a/searchcore/src/tests/proton/attribute/imported_attributes_repo/FILES b/searchcore/src/tests/proton/attribute/imported_attributes_repo/FILES
deleted file mode 100644
index 0e4f940c76c..00000000000
--- a/searchcore/src/tests/proton/attribute/imported_attributes_repo/FILES
+++ /dev/null
@@ -1 +0,0 @@
-imported_attributes_repo_test.cpp
diff --git a/searchcore/src/tests/proton/bucketdb/bucketdb/DESC b/searchcore/src/tests/proton/bucketdb/bucketdb/DESC
deleted file mode 100644
index 59057628f89..00000000000
--- a/searchcore/src/tests/proton/bucketdb/bucketdb/DESC
+++ /dev/null
@@ -1 +0,0 @@
-bucketdb test. Take a look at bucketdb_test.cpp for details.
diff --git a/searchcore/src/tests/proton/bucketdb/bucketdb/FILES b/searchcore/src/tests/proton/bucketdb/bucketdb/FILES
deleted file mode 100644
index c5cd1105c23..00000000000
--- a/searchcore/src/tests/proton/bucketdb/bucketdb/FILES
+++ /dev/null
@@ -1 +0,0 @@
-bucketdb_test.cpp
diff --git a/searchcore/src/tests/proton/common/document_type_inspector/DESC b/searchcore/src/tests/proton/common/document_type_inspector/DESC
deleted file mode 100644
index b40b3219939..00000000000
--- a/searchcore/src/tests/proton/common/document_type_inspector/DESC
+++ /dev/null
@@ -1,2 +0,0 @@
-Test for document type inspector. Take a look at document_type_inspector_test.cpp for details.
-
diff --git a/searchcore/src/tests/proton/common/document_type_inspector/FILES b/searchcore/src/tests/proton/common/document_type_inspector/FILES
deleted file mode 100644
index 1a0b0b31a76..00000000000
--- a/searchcore/src/tests/proton/common/document_type_inspector/FILES
+++ /dev/null
@@ -1 +0,0 @@
-document_type_inspector_test.cpp
diff --git a/searchcore/src/tests/proton/common/hw_info_sampler/DESC b/searchcore/src/tests/proton/common/hw_info_sampler/DESC
deleted file mode 100644
index 82461c9b864..00000000000
--- a/searchcore/src/tests/proton/common/hw_info_sampler/DESC
+++ /dev/null
@@ -1,2 +0,0 @@
-Test for hw_info_sampler. Take a look at hw_info_sampler_test.cpp for details.
-
diff --git a/searchcore/src/tests/proton/common/hw_info_sampler/FILES b/searchcore/src/tests/proton/common/hw_info_sampler/FILES
deleted file mode 100644
index 164cdc82bce..00000000000
--- a/searchcore/src/tests/proton/common/hw_info_sampler/FILES
+++ /dev/null
@@ -1 +0,0 @@
-hw_info_sampler_test.cpp
diff --git a/searchcore/src/tests/proton/common/state_reporter_utils/DESC b/searchcore/src/tests/proton/common/state_reporter_utils/DESC
deleted file mode 100644
index 7e4bc287738..00000000000
--- a/searchcore/src/tests/proton/common/state_reporter_utils/DESC
+++ /dev/null
@@ -1 +0,0 @@
-state reporter utils test. Take a look at state_reporter_utils_test.cpp for details.
diff --git a/searchcore/src/tests/proton/common/state_reporter_utils/FILES b/searchcore/src/tests/proton/common/state_reporter_utils/FILES
deleted file mode 100644
index cbea1ab5ad2..00000000000
--- a/searchcore/src/tests/proton/common/state_reporter_utils/FILES
+++ /dev/null
@@ -1 +0,0 @@
-state_reporter_utils_test.cpp
diff --git a/searchcore/src/tests/proton/docsummary/DESC b/searchcore/src/tests/proton/docsummary/DESC
deleted file mode 100644
index ba16d5453b6..00000000000
--- a/searchcore/src/tests/proton/docsummary/DESC
+++ /dev/null
@@ -1 +0,0 @@
-docsummary test. Take a look at docsummary.cpp for details.
diff --git a/searchcore/src/tests/proton/docsummary/FILES b/searchcore/src/tests/proton/docsummary/FILES
deleted file mode 100644
index e63fca83f2e..00000000000
--- a/searchcore/src/tests/proton/docsummary/FILES
+++ /dev/null
@@ -1 +0,0 @@
-docsummary.cpp
diff --git a/searchcore/src/tests/proton/document_iterator/FILES b/searchcore/src/tests/proton/document_iterator/FILES
deleted file mode 100644
index 351464d9f46..00000000000
--- a/searchcore/src/tests/proton/document_iterator/FILES
+++ /dev/null
@@ -1 +0,0 @@
-document_iterator_test.cpp
diff --git a/searchcore/src/tests/proton/documentdb/DESC b/searchcore/src/tests/proton/documentdb/DESC
deleted file mode 100644
index 0f8cbcb2eb0..00000000000
--- a/searchcore/src/tests/proton/documentdb/DESC
+++ /dev/null
@@ -1 +0,0 @@
-documentdb test. Take a look at documentdb_test.cpp for details.
diff --git a/searchcore/src/tests/proton/documentdb/FILES b/searchcore/src/tests/proton/documentdb/FILES
deleted file mode 100644
index 50fef46855d..00000000000
--- a/searchcore/src/tests/proton/documentdb/FILES
+++ /dev/null
@@ -1 +0,0 @@
-documentdb_test.cpp
diff --git a/searchcore/src/tests/proton/documentdb/buckethandler/DESC b/searchcore/src/tests/proton/documentdb/buckethandler/DESC
deleted file mode 100644
index f844b837422..00000000000
--- a/searchcore/src/tests/proton/documentdb/buckethandler/DESC
+++ /dev/null
@@ -1 +0,0 @@
-buckethandler test. Take a look at buckethandler_test.cpp for details.
diff --git a/searchcore/src/tests/proton/documentdb/buckethandler/FILES b/searchcore/src/tests/proton/documentdb/buckethandler/FILES
deleted file mode 100644
index df0589a342b..00000000000
--- a/searchcore/src/tests/proton/documentdb/buckethandler/FILES
+++ /dev/null
@@ -1 +0,0 @@
-buckethandler_test.cpp
diff --git a/searchcore/src/tests/proton/documentdb/clusterstatehandler/DESC b/searchcore/src/tests/proton/documentdb/clusterstatehandler/DESC
deleted file mode 100644
index 5d5921dea9a..00000000000
--- a/searchcore/src/tests/proton/documentdb/clusterstatehandler/DESC
+++ /dev/null
@@ -1 +0,0 @@
-clusterstatehandler test. Take a look at clusterstatehandler_test.cpp for details.
diff --git a/searchcore/src/tests/proton/documentdb/clusterstatehandler/FILES b/searchcore/src/tests/proton/documentdb/clusterstatehandler/FILES
deleted file mode 100644
index 92fc297c2a4..00000000000
--- a/searchcore/src/tests/proton/documentdb/clusterstatehandler/FILES
+++ /dev/null
@@ -1 +0,0 @@
-clusterstatehandler_test.cpp
diff --git a/searchcore/src/tests/proton/documentdb/combiningfeedview/DESC b/searchcore/src/tests/proton/documentdb/combiningfeedview/DESC
deleted file mode 100644
index 9882151634a..00000000000
--- a/searchcore/src/tests/proton/documentdb/combiningfeedview/DESC
+++ /dev/null
@@ -1 +0,0 @@
-combiningfeedview test. Take a look at combiningfeedview_test.cpp for details.
diff --git a/searchcore/src/tests/proton/documentdb/combiningfeedview/FILES b/searchcore/src/tests/proton/documentdb/combiningfeedview/FILES
deleted file mode 100644
index 791dc90442c..00000000000
--- a/searchcore/src/tests/proton/documentdb/combiningfeedview/FILES
+++ /dev/null
@@ -1 +0,0 @@
-combiningfeedview_test.cpp
diff --git a/searchcore/src/tests/proton/documentdb/configurer/DESC b/searchcore/src/tests/proton/documentdb/configurer/DESC
deleted file mode 100644
index 5d7765db8d2..00000000000
--- a/searchcore/src/tests/proton/documentdb/configurer/DESC
+++ /dev/null
@@ -1 +0,0 @@
-configurer test. Take a look at configurer_test.cpp for details.
diff --git a/searchcore/src/tests/proton/documentdb/configurer/FILES b/searchcore/src/tests/proton/documentdb/configurer/FILES
deleted file mode 100644
index a7ff508edc0..00000000000
--- a/searchcore/src/tests/proton/documentdb/configurer/FILES
+++ /dev/null
@@ -1 +0,0 @@
-configurer_test.cpp
diff --git a/searchcore/src/tests/proton/documentdb/document_scan_iterator/DESC b/searchcore/src/tests/proton/documentdb/document_scan_iterator/DESC
deleted file mode 100644
index b5965bc2f2d..00000000000
--- a/searchcore/src/tests/proton/documentdb/document_scan_iterator/DESC
+++ /dev/null
@@ -1,2 +0,0 @@
-Test for document scan iterator. Take a look at document_scan_iterator_test.cpp for details.
-
diff --git a/searchcore/src/tests/proton/documentdb/document_scan_iterator/FILES b/searchcore/src/tests/proton/documentdb/document_scan_iterator/FILES
deleted file mode 100644
index f1b6d86a774..00000000000
--- a/searchcore/src/tests/proton/documentdb/document_scan_iterator/FILES
+++ /dev/null
@@ -1 +0,0 @@
-document_scan_iterator_test.cpp
diff --git a/searchcore/src/tests/proton/documentdb/document_subdbs/DESC b/searchcore/src/tests/proton/documentdb/document_subdbs/DESC
deleted file mode 100644
index 22718579d4c..00000000000
--- a/searchcore/src/tests/proton/documentdb/document_subdbs/DESC
+++ /dev/null
@@ -1 +0,0 @@
-Test for document sub db implementations. Take a look at document_subdbs_test.cpp for details.
diff --git a/searchcore/src/tests/proton/documentdb/document_subdbs/FILES b/searchcore/src/tests/proton/documentdb/document_subdbs/FILES
deleted file mode 100644
index 3d5222f3212..00000000000
--- a/searchcore/src/tests/proton/documentdb/document_subdbs/FILES
+++ /dev/null
@@ -1 +0,0 @@
-document_subdbs_test.cpp
diff --git a/searchcore/src/tests/proton/documentdb/documentbucketmover/DESC b/searchcore/src/tests/proton/documentdb/documentbucketmover/DESC
deleted file mode 100644
index 7746f5e2222..00000000000
--- a/searchcore/src/tests/proton/documentdb/documentbucketmover/DESC
+++ /dev/null
@@ -1 +0,0 @@
-documentbucketmover test. Take a look at documentbucketmover_test.cpp for details.
diff --git a/searchcore/src/tests/proton/documentdb/documentbucketmover/FILES b/searchcore/src/tests/proton/documentdb/documentbucketmover/FILES
deleted file mode 100644
index b035525acff..00000000000
--- a/searchcore/src/tests/proton/documentdb/documentbucketmover/FILES
+++ /dev/null
@@ -1 +0,0 @@
-documentbucketmover_test.cpp
diff --git a/searchcore/src/tests/proton/documentdb/documentdbconfig/DESC b/searchcore/src/tests/proton/documentdb/documentdbconfig/DESC
deleted file mode 100644
index e2893dff557..00000000000
--- a/searchcore/src/tests/proton/documentdb/documentdbconfig/DESC
+++ /dev/null
@@ -1 +0,0 @@
-DocumentDBConfig test. Take a look at documentdbconfig_test.cpp for details.
diff --git a/searchcore/src/tests/proton/documentdb/documentdbconfig/FILES b/searchcore/src/tests/proton/documentdb/documentdbconfig/FILES
deleted file mode 100644
index 5298158fdbd..00000000000
--- a/searchcore/src/tests/proton/documentdb/documentdbconfig/FILES
+++ /dev/null
@@ -1 +0,0 @@
-documentdbconfig_test.cpp
diff --git a/searchcore/src/tests/proton/documentdb/documentdbconfigscout/DESC b/searchcore/src/tests/proton/documentdb/documentdbconfigscout/DESC
deleted file mode 100644
index 6585b4bc2b2..00000000000
--- a/searchcore/src/tests/proton/documentdb/documentdbconfigscout/DESC
+++ /dev/null
@@ -1 +0,0 @@
-DocumentDBConfigScout test. Take a look at documentdbconfigscout_test.cpp for details.
diff --git a/searchcore/src/tests/proton/documentdb/documentdbconfigscout/FILES b/searchcore/src/tests/proton/documentdb/documentdbconfigscout/FILES
deleted file mode 100644
index 38b76884ae0..00000000000
--- a/searchcore/src/tests/proton/documentdb/documentdbconfigscout/FILES
+++ /dev/null
@@ -1 +0,0 @@
-documentdbconfigscout_test.cpp
diff --git a/searchcore/src/tests/proton/documentdb/feedhandler/DESC b/searchcore/src/tests/proton/documentdb/feedhandler/DESC
deleted file mode 100644
index c29d8c9a6e9..00000000000
--- a/searchcore/src/tests/proton/documentdb/feedhandler/DESC
+++ /dev/null
@@ -1 +0,0 @@
-feedhandler test. Take a look at feedhandler_test.cpp for details.
diff --git a/searchcore/src/tests/proton/documentdb/feedhandler/FILES b/searchcore/src/tests/proton/documentdb/feedhandler/FILES
deleted file mode 100644
index 483ca5f0fcd..00000000000
--- a/searchcore/src/tests/proton/documentdb/feedhandler/FILES
+++ /dev/null
@@ -1 +0,0 @@
-feedhandler_test.cpp
diff --git a/searchcore/src/tests/proton/documentdb/feedview/DESC b/searchcore/src/tests/proton/documentdb/feedview/DESC
deleted file mode 100644
index 4c35f3d2a61..00000000000
--- a/searchcore/src/tests/proton/documentdb/feedview/DESC
+++ /dev/null
@@ -1 +0,0 @@
-feedview test. Take a look at feedview_test.cpp for details.
diff --git a/searchcore/src/tests/proton/documentdb/feedview/FILES b/searchcore/src/tests/proton/documentdb/feedview/FILES
deleted file mode 100644
index 3f8ae0c6889..00000000000
--- a/searchcore/src/tests/proton/documentdb/feedview/FILES
+++ /dev/null
@@ -1 +0,0 @@
-feedview_test.cpp
diff --git a/searchcore/src/tests/proton/documentdb/fileconfigmanager/DESC b/searchcore/src/tests/proton/documentdb/fileconfigmanager/DESC
deleted file mode 100644
index ab2f0ed8b46..00000000000
--- a/searchcore/src/tests/proton/documentdb/fileconfigmanager/DESC
+++ /dev/null
@@ -1 +0,0 @@
-fileconfigmanager test. Take a look at fileconfigmanager.cpp for details.
diff --git a/searchcore/src/tests/proton/documentdb/fileconfigmanager/FILES b/searchcore/src/tests/proton/documentdb/fileconfigmanager/FILES
deleted file mode 100644
index 842440c7182..00000000000
--- a/searchcore/src/tests/proton/documentdb/fileconfigmanager/FILES
+++ /dev/null
@@ -1 +0,0 @@
-fileconfigmanager_test.cpp
diff --git a/searchcore/src/tests/proton/documentdb/job_tracked_maintenance_job/DESC b/searchcore/src/tests/proton/documentdb/job_tracked_maintenance_job/DESC
deleted file mode 100644
index 4ba7520eab8..00000000000
--- a/searchcore/src/tests/proton/documentdb/job_tracked_maintenance_job/DESC
+++ /dev/null
@@ -1,2 +0,0 @@
-job tracked maintenance job test. Take a look at job_tracked_maintenance_job_test.cpp for details.
-
diff --git a/searchcore/src/tests/proton/documentdb/job_tracked_maintenance_job/FILES b/searchcore/src/tests/proton/documentdb/job_tracked_maintenance_job/FILES
deleted file mode 100644
index a871a1fa8aa..00000000000
--- a/searchcore/src/tests/proton/documentdb/job_tracked_maintenance_job/FILES
+++ /dev/null
@@ -1 +0,0 @@
-job_tracked_maintenance_job_test.cpp
diff --git a/searchcore/src/tests/proton/documentdb/lid_space_compaction/DESC b/searchcore/src/tests/proton/documentdb/lid_space_compaction/DESC
deleted file mode 100644
index b361d232d13..00000000000
--- a/searchcore/src/tests/proton/documentdb/lid_space_compaction/DESC
+++ /dev/null
@@ -1,2 +0,0 @@
-Test for lid space compaction. Take a look at lid_space_compaction_test.cpp for details.
-
diff --git a/searchcore/src/tests/proton/documentdb/lid_space_compaction/FILES b/searchcore/src/tests/proton/documentdb/lid_space_compaction/FILES
deleted file mode 100644
index 48fa9ef87c6..00000000000
--- a/searchcore/src/tests/proton/documentdb/lid_space_compaction/FILES
+++ /dev/null
@@ -1 +0,0 @@
-lid_space_compaction_test.cpp
diff --git a/searchcore/src/tests/proton/documentdb/maintenancecontroller/DESC b/searchcore/src/tests/proton/documentdb/maintenancecontroller/DESC
deleted file mode 100644
index ad4e910a6f1..00000000000
--- a/searchcore/src/tests/proton/documentdb/maintenancecontroller/DESC
+++ /dev/null
@@ -1,2 +0,0 @@
-maintenance controller test. Take a look at maintenancecontroller_test.cpp
-for details.
diff --git a/searchcore/src/tests/proton/documentdb/maintenancecontroller/FILES b/searchcore/src/tests/proton/documentdb/maintenancecontroller/FILES
deleted file mode 100644
index 4bd439640f1..00000000000
--- a/searchcore/src/tests/proton/documentdb/maintenancecontroller/FILES
+++ /dev/null
@@ -1,2 +0,0 @@
-maintenancecontroller_test.cpp
-frozenbucketsmap_test.cpp
diff --git a/searchcore/src/tests/proton/documentdb/move_operation_limiter/FILES b/searchcore/src/tests/proton/documentdb/move_operation_limiter/FILES
deleted file mode 100644
index 833ddbf7789..00000000000
--- a/searchcore/src/tests/proton/documentdb/move_operation_limiter/FILES
+++ /dev/null
@@ -1 +0,0 @@
-move_operation_limiter_test.cpp
diff --git a/searchcore/src/tests/proton/documentmetastore/DESC b/searchcore/src/tests/proton/documentmetastore/DESC
deleted file mode 100644
index 7a7bdaae267..00000000000
--- a/searchcore/src/tests/proton/documentmetastore/DESC
+++ /dev/null
@@ -1 +0,0 @@
-documentmetastore test. Take a look at documentmetastore_test.cpp for details.
diff --git a/searchcore/src/tests/proton/documentmetastore/FILES b/searchcore/src/tests/proton/documentmetastore/FILES
deleted file mode 100644
index 29d56a32b24..00000000000
--- a/searchcore/src/tests/proton/documentmetastore/FILES
+++ /dev/null
@@ -1 +0,0 @@
-documentmetastore_test.cpp
diff --git a/searchcore/src/tests/proton/documentmetastore/lidreusedelayer/DESC b/searchcore/src/tests/proton/documentmetastore/lidreusedelayer/DESC
deleted file mode 100644
index 73e755c73c6..00000000000
--- a/searchcore/src/tests/proton/documentmetastore/lidreusedelayer/DESC
+++ /dev/null
@@ -1 +0,0 @@
-LID reuse delayer test. Take a look at lidreusedelayer_test.cpp for details.
diff --git a/searchcore/src/tests/proton/documentmetastore/lidreusedelayer/FILES b/searchcore/src/tests/proton/documentmetastore/lidreusedelayer/FILES
deleted file mode 100644
index 4965f6577f6..00000000000
--- a/searchcore/src/tests/proton/documentmetastore/lidreusedelayer/FILES
+++ /dev/null
@@ -1 +0,0 @@
-lidreusedelayer_test.cpp
diff --git a/searchcore/src/tests/proton/feed_and_search/DESC b/searchcore/src/tests/proton/feed_and_search/DESC
deleted file mode 100644
index 0ae466eb2c9..00000000000
--- a/searchcore/src/tests/proton/feed_and_search/DESC
+++ /dev/null
@@ -1 +0,0 @@
-feed_and_search test. Take a look at feed_and_search.cpp for details.
diff --git a/searchcore/src/tests/proton/feed_and_search/FILES b/searchcore/src/tests/proton/feed_and_search/FILES
deleted file mode 100644
index cd160110672..00000000000
--- a/searchcore/src/tests/proton/feed_and_search/FILES
+++ /dev/null
@@ -1 +0,0 @@
-feed_and_search.cpp
diff --git a/searchcore/src/tests/proton/feedtoken/DESC b/searchcore/src/tests/proton/feedtoken/DESC
deleted file mode 100644
index 6fd2921a8c4..00000000000
--- a/searchcore/src/tests/proton/feedtoken/DESC
+++ /dev/null
@@ -1 +0,0 @@
-feedtoken test. Take a look at feedtoken.cpp for details.
diff --git a/searchcore/src/tests/proton/feedtoken/FILES b/searchcore/src/tests/proton/feedtoken/FILES
deleted file mode 100644
index 052aab3d388..00000000000
--- a/searchcore/src/tests/proton/feedtoken/FILES
+++ /dev/null
@@ -1 +0,0 @@
-feedtoken.cpp
diff --git a/searchcore/src/tests/proton/flushengine/DESC b/searchcore/src/tests/proton/flushengine/DESC
deleted file mode 100644
index 87a9f388463..00000000000
--- a/searchcore/src/tests/proton/flushengine/DESC
+++ /dev/null
@@ -1 +0,0 @@
-flushengine test. Take a look at flushengine.cpp for details.
diff --git a/searchcore/src/tests/proton/flushengine/FILES b/searchcore/src/tests/proton/flushengine/FILES
deleted file mode 100644
index 5156cba47e7..00000000000
--- a/searchcore/src/tests/proton/flushengine/FILES
+++ /dev/null
@@ -1 +0,0 @@
-flushengine.cpp
diff --git a/searchcore/src/tests/proton/flushengine/prepare_restart_flush_strategy/DESC b/searchcore/src/tests/proton/flushengine/prepare_restart_flush_strategy/DESC
deleted file mode 100644
index 77474a51fbb..00000000000
--- a/searchcore/src/tests/proton/flushengine/prepare_restart_flush_strategy/DESC
+++ /dev/null
@@ -1 +0,0 @@
-prepare_restart_flush_strategy test. Take a look at prepare_restart_flush_strategy_test.cpp for details.
diff --git a/searchcore/src/tests/proton/flushengine/prepare_restart_flush_strategy/FILES b/searchcore/src/tests/proton/flushengine/prepare_restart_flush_strategy/FILES
deleted file mode 100644
index 35ad6c54f3c..00000000000
--- a/searchcore/src/tests/proton/flushengine/prepare_restart_flush_strategy/FILES
+++ /dev/null
@@ -1 +0,0 @@
-prepare_restart_flush_strategy_test.cpp
diff --git a/searchcore/src/tests/proton/flushengine/shrink_lid_space_flush_target/DESC b/searchcore/src/tests/proton/flushengine/shrink_lid_space_flush_target/DESC
deleted file mode 100644
index e8cb3013c29..00000000000
--- a/searchcore/src/tests/proton/flushengine/shrink_lid_space_flush_target/DESC
+++ /dev/null
@@ -1 +0,0 @@
-ShrinkLidSpaceFlushTarget test. Take a look at shrink_lid_space_flush_target_test.cpp for details.
diff --git a/searchcore/src/tests/proton/flushengine/shrink_lid_space_flush_target/FILES b/searchcore/src/tests/proton/flushengine/shrink_lid_space_flush_target/FILES
deleted file mode 100644
index 54ff425acdd..00000000000
--- a/searchcore/src/tests/proton/flushengine/shrink_lid_space_flush_target/FILES
+++ /dev/null
@@ -1 +0,0 @@
-shrink_lid_space_flush_target_test.cpp
diff --git a/searchcore/src/tests/proton/index/index_writer/DESC b/searchcore/src/tests/proton/index/index_writer/DESC
deleted file mode 100644
index ea5596d3039..00000000000
--- a/searchcore/src/tests/proton/index/index_writer/DESC
+++ /dev/null
@@ -1 +0,0 @@
-index writer test. Take a look at index_writer_test.cpp for details.
diff --git a/searchcore/src/tests/proton/index/index_writer/FILES b/searchcore/src/tests/proton/index/index_writer/FILES
deleted file mode 100644
index 3b26c7f84ad..00000000000
--- a/searchcore/src/tests/proton/index/index_writer/FILES
+++ /dev/null
@@ -1 +0,0 @@
-index_writer_test.cpp
diff --git a/searchcore/src/tests/proton/initializer/DESC b/searchcore/src/tests/proton/initializer/DESC
deleted file mode 100644
index be2743a181e..00000000000
--- a/searchcore/src/tests/proton/initializer/DESC
+++ /dev/null
@@ -1 +0,0 @@
-TaskRunner test. Take a look at task_runner_test.cpp for details.
diff --git a/searchcore/src/tests/proton/initializer/FILES b/searchcore/src/tests/proton/initializer/FILES
deleted file mode 100644
index bbbbe1c2d86..00000000000
--- a/searchcore/src/tests/proton/initializer/FILES
+++ /dev/null
@@ -1 +0,0 @@
-task_runner_test.cpp
diff --git a/searchcore/src/tests/proton/matchengine/DESC b/searchcore/src/tests/proton/matchengine/DESC
deleted file mode 100644
index 1530502e2de..00000000000
--- a/searchcore/src/tests/proton/matchengine/DESC
+++ /dev/null
@@ -1 +0,0 @@
-matchengine test. Take a look at matchengine.cpp for details.
diff --git a/searchcore/src/tests/proton/matchengine/FILES b/searchcore/src/tests/proton/matchengine/FILES
deleted file mode 100644
index 91961877ee2..00000000000
--- a/searchcore/src/tests/proton/matchengine/FILES
+++ /dev/null
@@ -1 +0,0 @@
-matchengine.cpp
diff --git a/searchcore/src/tests/proton/matching/DESC b/searchcore/src/tests/proton/matching/DESC
deleted file mode 100644
index 435b17f333e..00000000000
--- a/searchcore/src/tests/proton/matching/DESC
+++ /dev/null
@@ -1 +0,0 @@
-matching test. Take a look at matching.cpp for details.
diff --git a/searchcore/src/tests/proton/matching/FILES b/searchcore/src/tests/proton/matching/FILES
deleted file mode 100644
index 0213f77d899..00000000000
--- a/searchcore/src/tests/proton/matching/FILES
+++ /dev/null
@@ -1 +0,0 @@
-matching.cpp
diff --git a/searchcore/src/tests/proton/matching/match_loop_communicator/FILES b/searchcore/src/tests/proton/matching/match_loop_communicator/FILES
deleted file mode 100644
index d2f1096aaa3..00000000000
--- a/searchcore/src/tests/proton/matching/match_loop_communicator/FILES
+++ /dev/null
@@ -1 +0,0 @@
-match_loop_communicator_test.cpp
diff --git a/searchcore/src/tests/proton/matching/match_phase_limiter/FILES b/searchcore/src/tests/proton/matching/match_phase_limiter/FILES
deleted file mode 100644
index 776925a0d69..00000000000
--- a/searchcore/src/tests/proton/matching/match_phase_limiter/FILES
+++ /dev/null
@@ -1 +0,0 @@
-match_phase_limiter_test.cpp
diff --git a/searchcore/src/tests/proton/matching/partial_result/FILES b/searchcore/src/tests/proton/matching/partial_result/FILES
deleted file mode 100644
index cb7cdbd3bb6..00000000000
--- a/searchcore/src/tests/proton/matching/partial_result/FILES
+++ /dev/null
@@ -1 +0,0 @@
-partial_result_test.cpp
diff --git a/searchcore/src/tests/proton/metrics/documentdb_job_trackers/DESC b/searchcore/src/tests/proton/metrics/documentdb_job_trackers/DESC
deleted file mode 100644
index ccd322886ea..00000000000
--- a/searchcore/src/tests/proton/metrics/documentdb_job_trackers/DESC
+++ /dev/null
@@ -1 +0,0 @@
-documentdb job trackers test. Take a look at documentdb_job_trackers_test.cpp for details.
diff --git a/searchcore/src/tests/proton/metrics/documentdb_job_trackers/FILES b/searchcore/src/tests/proton/metrics/documentdb_job_trackers/FILES
deleted file mode 100644
index a63504feca2..00000000000
--- a/searchcore/src/tests/proton/metrics/documentdb_job_trackers/FILES
+++ /dev/null
@@ -1 +0,0 @@
-documentdb_job_trackers_test.cpp
diff --git a/searchcore/src/tests/proton/metrics/job_load_sampler/DESC b/searchcore/src/tests/proton/metrics/job_load_sampler/DESC
deleted file mode 100644
index 966bcdf83f6..00000000000
--- a/searchcore/src/tests/proton/metrics/job_load_sampler/DESC
+++ /dev/null
@@ -1 +0,0 @@
-job load sampler test. Take a look at job_load_sampler_test.cpp for details.
diff --git a/searchcore/src/tests/proton/metrics/job_load_sampler/FILES b/searchcore/src/tests/proton/metrics/job_load_sampler/FILES
deleted file mode 100644
index 1112ae6c5da..00000000000
--- a/searchcore/src/tests/proton/metrics/job_load_sampler/FILES
+++ /dev/null
@@ -1 +0,0 @@
-job_load_sampler_test.cpp
diff --git a/searchcore/src/tests/proton/metrics/job_tracked_flush/DESC b/searchcore/src/tests/proton/metrics/job_tracked_flush/DESC
deleted file mode 100644
index b62528ff8b4..00000000000
--- a/searchcore/src/tests/proton/metrics/job_tracked_flush/DESC
+++ /dev/null
@@ -1,2 +0,0 @@
-job tracked flush target/task test. Take a look at job_tracked_flush_test.cpp for details.
-
diff --git a/searchcore/src/tests/proton/metrics/job_tracked_flush/FILES b/searchcore/src/tests/proton/metrics/job_tracked_flush/FILES
deleted file mode 100644
index 09f32789c94..00000000000
--- a/searchcore/src/tests/proton/metrics/job_tracked_flush/FILES
+++ /dev/null
@@ -1 +0,0 @@
-job_tracked_flush_test.cpp
diff --git a/searchcore/src/tests/proton/metrics/metrics_engine/DESC b/searchcore/src/tests/proton/metrics/metrics_engine/DESC
deleted file mode 100644
index 2efe31d45d3..00000000000
--- a/searchcore/src/tests/proton/metrics/metrics_engine/DESC
+++ /dev/null
@@ -1 +0,0 @@
-metrics engine test. Take a look at metrics_engine_test.cpp for details.
diff --git a/searchcore/src/tests/proton/metrics/metrics_engine/FILES b/searchcore/src/tests/proton/metrics/metrics_engine/FILES
deleted file mode 100644
index ac033a53070..00000000000
--- a/searchcore/src/tests/proton/metrics/metrics_engine/FILES
+++ /dev/null
@@ -1 +0,0 @@
-metrics_engine_test.cpp
diff --git a/searchcore/src/tests/proton/persistenceconformance/DESC b/searchcore/src/tests/proton/persistenceconformance/DESC
deleted file mode 100644
index 98392d5a316..00000000000
--- a/searchcore/src/tests/proton/persistenceconformance/DESC
+++ /dev/null
@@ -1 +0,0 @@
-Persistence provider conformance test for proton integration. Take a look at persistenceconformance_test.cpp for details.
diff --git a/searchcore/src/tests/proton/persistenceconformance/FILES b/searchcore/src/tests/proton/persistenceconformance/FILES
deleted file mode 100644
index 6912ecd1d9b..00000000000
--- a/searchcore/src/tests/proton/persistenceconformance/FILES
+++ /dev/null
@@ -1 +0,0 @@
-persistenceconformance_test.cpp
diff --git a/searchcore/src/tests/proton/persistenceengine/DESC b/searchcore/src/tests/proton/persistenceengine/DESC
deleted file mode 100644
index ec363711b48..00000000000
--- a/searchcore/src/tests/proton/persistenceengine/DESC
+++ /dev/null
@@ -1 +0,0 @@
-persistenceengine test. Take a look at persistenceengine_test.cpp for details.
diff --git a/searchcore/src/tests/proton/persistenceengine/FILES b/searchcore/src/tests/proton/persistenceengine/FILES
deleted file mode 100644
index 12d47ca9632..00000000000
--- a/searchcore/src/tests/proton/persistenceengine/FILES
+++ /dev/null
@@ -1 +0,0 @@
-persistenceengine_test.cpp
diff --git a/searchcore/src/tests/proton/reference/document_db_reference/FILES b/searchcore/src/tests/proton/reference/document_db_reference/FILES
deleted file mode 100644
index af035b253b8..00000000000
--- a/searchcore/src/tests/proton/reference/document_db_reference/FILES
+++ /dev/null
@@ -1 +0,0 @@
-document_db_reference_test.cpp
diff --git a/searchcore/src/tests/proton/reference/document_db_reference_registry/DESC b/searchcore/src/tests/proton/reference/document_db_reference_registry/DESC
deleted file mode 100644
index a71a62917f1..00000000000
--- a/searchcore/src/tests/proton/reference/document_db_reference_registry/DESC
+++ /dev/null
@@ -1 +0,0 @@
-document_db_reference_registry test. Take a look at document_db_reference_registry_test.cpp for details.
diff --git a/searchcore/src/tests/proton/reference/document_db_reference_registry/FILES b/searchcore/src/tests/proton/reference/document_db_reference_registry/FILES
deleted file mode 100644
index 3a00650715a..00000000000
--- a/searchcore/src/tests/proton/reference/document_db_reference_registry/FILES
+++ /dev/null
@@ -1 +0,0 @@
-document_db_reference_registry_test.cpp
diff --git a/searchcore/src/tests/proton/reference/document_db_reference_resolver/DESC b/searchcore/src/tests/proton/reference/document_db_reference_resolver/DESC
deleted file mode 100644
index 3a8fe966966..00000000000
--- a/searchcore/src/tests/proton/reference/document_db_reference_resolver/DESC
+++ /dev/null
@@ -1 +0,0 @@
-document_db_reference_resolver test. Take a look at document_db_reference_resolver_test.cpp for details.
diff --git a/searchcore/src/tests/proton/reference/document_db_reference_resolver/FILES b/searchcore/src/tests/proton/reference/document_db_reference_resolver/FILES
deleted file mode 100644
index 15233d66c94..00000000000
--- a/searchcore/src/tests/proton/reference/document_db_reference_resolver/FILES
+++ /dev/null
@@ -1 +0,0 @@
-document_db_reference_resolver_test.cpp
diff --git a/searchcore/src/tests/proton/reference/gid_to_lid_change_handler/DESC b/searchcore/src/tests/proton/reference/gid_to_lid_change_handler/DESC
deleted file mode 100644
index 362de49669b..00000000000
--- a/searchcore/src/tests/proton/reference/gid_to_lid_change_handler/DESC
+++ /dev/null
@@ -1 +0,0 @@
-gid_to_lid_change_handler test. Take a look at gid_to_lid_change_handler_test.cpp for details.
diff --git a/searchcore/src/tests/proton/reference/gid_to_lid_change_handler/FILES b/searchcore/src/tests/proton/reference/gid_to_lid_change_handler/FILES
deleted file mode 100644
index 451157507fd..00000000000
--- a/searchcore/src/tests/proton/reference/gid_to_lid_change_handler/FILES
+++ /dev/null
@@ -1 +0,0 @@
-gid_to_lid_change_handler_test.cpp
diff --git a/searchcore/src/tests/proton/reference/gid_to_lid_change_listener/DESC b/searchcore/src/tests/proton/reference/gid_to_lid_change_listener/DESC
deleted file mode 100644
index ab26dd60a1b..00000000000
--- a/searchcore/src/tests/proton/reference/gid_to_lid_change_listener/DESC
+++ /dev/null
@@ -1 +0,0 @@
-gid_to_lid_change_listener test. Take a look at gid_to_lid_change_listener_test.cpp for details.
diff --git a/searchcore/src/tests/proton/reference/gid_to_lid_change_listener/FILES b/searchcore/src/tests/proton/reference/gid_to_lid_change_listener/FILES
deleted file mode 100644
index ad1848502a5..00000000000
--- a/searchcore/src/tests/proton/reference/gid_to_lid_change_listener/FILES
+++ /dev/null
@@ -1 +0,0 @@
-gid_to_lid_change_listener_test.cpp
diff --git a/searchcore/src/tests/proton/reference/gid_to_lid_change_registrator/DESC b/searchcore/src/tests/proton/reference/gid_to_lid_change_registrator/DESC
deleted file mode 100644
index a5f481dd092..00000000000
--- a/searchcore/src/tests/proton/reference/gid_to_lid_change_registrator/DESC
+++ /dev/null
@@ -1 +0,0 @@
-gid_to_lid_change_registrator test. Take a look at gid_to_lid_change_registrator_test.cpp for details.
diff --git a/searchcore/src/tests/proton/reference/gid_to_lid_change_registrator/FILES b/searchcore/src/tests/proton/reference/gid_to_lid_change_registrator/FILES
deleted file mode 100644
index 60e12f3f836..00000000000
--- a/searchcore/src/tests/proton/reference/gid_to_lid_change_registrator/FILES
+++ /dev/null
@@ -1 +0,0 @@
-gid_to_lid_change_registrator_test.cpp
diff --git a/searchcore/src/tests/proton/reference/gid_to_lid_mapper/DESC b/searchcore/src/tests/proton/reference/gid_to_lid_mapper/DESC
deleted file mode 100644
index f251a0c3ac2..00000000000
--- a/searchcore/src/tests/proton/reference/gid_to_lid_mapper/DESC
+++ /dev/null
@@ -1 +0,0 @@
-gid_to_lid_mapper test. Take a look at gid_to_lid_mapper_test.cpp for details.
diff --git a/searchcore/src/tests/proton/reference/gid_to_lid_mapper/FILES b/searchcore/src/tests/proton/reference/gid_to_lid_mapper/FILES
deleted file mode 100644
index 13c38a92974..00000000000
--- a/searchcore/src/tests/proton/reference/gid_to_lid_mapper/FILES
+++ /dev/null
@@ -1 +0,0 @@
-gid_to_lid_mapper_test.cpp
diff --git a/searchcore/src/tests/proton/reprocessing/attribute_reprocessing_initializer/DESC b/searchcore/src/tests/proton/reprocessing/attribute_reprocessing_initializer/DESC
deleted file mode 100644
index 2ae1d0c8164..00000000000
--- a/searchcore/src/tests/proton/reprocessing/attribute_reprocessing_initializer/DESC
+++ /dev/null
@@ -1,2 +0,0 @@
-Test for attribute reprocessing initializer. Take a look at attribute_reprocessing_initializer_test.cpp for details.
-
diff --git a/searchcore/src/tests/proton/reprocessing/attribute_reprocessing_initializer/FILES b/searchcore/src/tests/proton/reprocessing/attribute_reprocessing_initializer/FILES
deleted file mode 100644
index 6c9084f176d..00000000000
--- a/searchcore/src/tests/proton/reprocessing/attribute_reprocessing_initializer/FILES
+++ /dev/null
@@ -1 +0,0 @@
-attribute_reprocessing_initializer_test.cpp
diff --git a/searchcore/src/tests/proton/reprocessing/document_reprocessing_handler/DESC b/searchcore/src/tests/proton/reprocessing/document_reprocessing_handler/DESC
deleted file mode 100644
index 663b2304d37..00000000000
--- a/searchcore/src/tests/proton/reprocessing/document_reprocessing_handler/DESC
+++ /dev/null
@@ -1,2 +0,0 @@
-Test for document reprocessing handler. Take a look at document_reprocessing_handler_test.cpp for details.
-
diff --git a/searchcore/src/tests/proton/reprocessing/document_reprocessing_handler/FILES b/searchcore/src/tests/proton/reprocessing/document_reprocessing_handler/FILES
deleted file mode 100644
index 2301fc01844..00000000000
--- a/searchcore/src/tests/proton/reprocessing/document_reprocessing_handler/FILES
+++ /dev/null
@@ -1 +0,0 @@
-document_reprocessing_handler_test.cpp
diff --git a/searchcore/src/tests/proton/reprocessing/reprocessing_runner/DESC b/searchcore/src/tests/proton/reprocessing/reprocessing_runner/DESC
deleted file mode 100644
index ffa0db7ae9e..00000000000
--- a/searchcore/src/tests/proton/reprocessing/reprocessing_runner/DESC
+++ /dev/null
@@ -1 +0,0 @@
-Test reprocessing runner.
diff --git a/searchcore/src/tests/proton/reprocessing/reprocessing_runner/FILES b/searchcore/src/tests/proton/reprocessing/reprocessing_runner/FILES
deleted file mode 100644
index 091769d58cb..00000000000
--- a/searchcore/src/tests/proton/reprocessing/reprocessing_runner/FILES
+++ /dev/null
@@ -1 +0,0 @@
-reprocessing_runner_test.cpp
diff --git a/searchcore/src/tests/proton/server/disk_mem_usage_filter/DESC b/searchcore/src/tests/proton/server/disk_mem_usage_filter/DESC
deleted file mode 100644
index fca9e3b7656..00000000000
--- a/searchcore/src/tests/proton/server/disk_mem_usage_filter/DESC
+++ /dev/null
@@ -1 +0,0 @@
-DiskMemUsageFilter test. Take a look at disk_mem_usage_filter_test.cpp for details.
diff --git a/searchcore/src/tests/proton/server/disk_mem_usage_filter/FILES b/searchcore/src/tests/proton/server/disk_mem_usage_filter/FILES
deleted file mode 100644
index b6cdfc4bffc..00000000000
--- a/searchcore/src/tests/proton/server/disk_mem_usage_filter/FILES
+++ /dev/null
@@ -1 +0,0 @@
-disk_mem_usage_filter_test.cpp
diff --git a/searchcore/src/tests/proton/server/health_adapter/FILES b/searchcore/src/tests/proton/server/health_adapter/FILES
deleted file mode 100644
index 6faa8f6155f..00000000000
--- a/searchcore/src/tests/proton/server/health_adapter/FILES
+++ /dev/null
@@ -1 +0,0 @@
-health_adapter_test.cpp
diff --git a/searchcore/src/tests/proton/server/memory_flush_config_updater/DESC b/searchcore/src/tests/proton/server/memory_flush_config_updater/DESC
deleted file mode 100644
index b183c571bcc..00000000000
--- a/searchcore/src/tests/proton/server/memory_flush_config_updater/DESC
+++ /dev/null
@@ -1 +0,0 @@
-memory_flush_config_updater test. Take a look at memory_flush_config_updater_test.cpp for details.
diff --git a/searchcore/src/tests/proton/server/memory_flush_config_updater/FILES b/searchcore/src/tests/proton/server/memory_flush_config_updater/FILES
deleted file mode 100644
index c36fcd27415..00000000000
--- a/searchcore/src/tests/proton/server/memory_flush_config_updater/FILES
+++ /dev/null
@@ -1 +0,0 @@
-memory_flush_config_updater_test.cpp
diff --git a/searchcore/src/tests/proton/server/memoryflush/DESC b/searchcore/src/tests/proton/server/memoryflush/DESC
deleted file mode 100644
index 69bfba597c4..00000000000
--- a/searchcore/src/tests/proton/server/memoryflush/DESC
+++ /dev/null
@@ -1 +0,0 @@
-memoryflush test. Take a look at memoryflush_test.cpp for details.
diff --git a/searchcore/src/tests/proton/server/memoryflush/FILES b/searchcore/src/tests/proton/server/memoryflush/FILES
deleted file mode 100644
index 94ca0c97eb0..00000000000
--- a/searchcore/src/tests/proton/server/memoryflush/FILES
+++ /dev/null
@@ -1 +0,0 @@
-memoryflush_test.cpp
diff --git a/searchcore/src/tests/proton/server/visibility_handler/DESC b/searchcore/src/tests/proton/server/visibility_handler/DESC
deleted file mode 100644
index 588cd8b923e..00000000000
--- a/searchcore/src/tests/proton/server/visibility_handler/DESC
+++ /dev/null
@@ -1 +0,0 @@
-visibility_handler test. Take a look at visibility_handler_test.cpp for details.
diff --git a/searchcore/src/tests/proton/server/visibility_handler/FILES b/searchcore/src/tests/proton/server/visibility_handler/FILES
deleted file mode 100644
index 8dea2c9d408..00000000000
--- a/searchcore/src/tests/proton/server/visibility_handler/FILES
+++ /dev/null
@@ -1 +0,0 @@
-visibility_handler_test.cpp
diff --git a/searchcore/src/tests/proton/statusreport/DESC b/searchcore/src/tests/proton/statusreport/DESC
deleted file mode 100644
index 36c1c49cc80..00000000000
--- a/searchcore/src/tests/proton/statusreport/DESC
+++ /dev/null
@@ -1 +0,0 @@
-statusreport test. Take a look at statusreport.cpp for details.
diff --git a/searchcore/src/tests/proton/statusreport/FILES b/searchcore/src/tests/proton/statusreport/FILES
deleted file mode 100644
index fe27097df03..00000000000
--- a/searchcore/src/tests/proton/statusreport/FILES
+++ /dev/null
@@ -1 +0,0 @@
-statusreport.cpp
diff --git a/searchcore/src/tests/proton/summaryengine/DESC b/searchcore/src/tests/proton/summaryengine/DESC
deleted file mode 100644
index be0687ecb07..00000000000
--- a/searchcore/src/tests/proton/summaryengine/DESC
+++ /dev/null
@@ -1 +0,0 @@
-summaryengine test. Take a look at summaryengine.cpp for details.
diff --git a/searchcore/src/tests/proton/summaryengine/FILES b/searchcore/src/tests/proton/summaryengine/FILES
deleted file mode 100644
index cef9a6e88bf..00000000000
--- a/searchcore/src/tests/proton/summaryengine/FILES
+++ /dev/null
@@ -1 +0,0 @@
-summaryengine.cpp
diff --git a/searchcore/src/tests/proton/verify_ranksetup/DESC b/searchcore/src/tests/proton/verify_ranksetup/DESC
deleted file mode 100644
index 700e2b1c2f9..00000000000
--- a/searchcore/src/tests/proton/verify_ranksetup/DESC
+++ /dev/null
@@ -1 +0,0 @@
-verify_ranksetup test. Take a look at verify_ranksetup.cpp for details.
diff --git a/searchcore/src/tests/proton/verify_ranksetup/FILES b/searchcore/src/tests/proton/verify_ranksetup/FILES
deleted file mode 100644
index 9c4a2ef3776..00000000000
--- a/searchcore/src/tests/proton/verify_ranksetup/FILES
+++ /dev/null
@@ -1 +0,0 @@
-verify_ranksetup.cpp