 +        }
 +    }.
 +
-+configuration_register_test_() ->
-+    {
-+        "OS daemon subscribed to config changes",
-+        {
-+            foreachx,
-+            fun setup/1, fun teardown/2,
-+            [{?DAEMON_CFGREG, Fun} || Fun <- [
-+                fun should_start_daemon/2,
-+                fun should_restart_daemon_on_section_change/2,
-+                fun should_not_restart_daemon_on_changing_ignored_section_key/2,
-+                fun should_restart_daemon_on_section_key_change/2
-+            ]]
-+        }
-+    }.
++%configuration_register_test_() ->
++%    {
++%        "OS daemon subscribed to config changes",
++%        {
++%            foreachx,
++%            fun setup/1, fun teardown/2,
++%            [{?DAEMON_CFGREG, Fun} || Fun <- [
++%                fun should_start_daemon/2,
++%                fun should_restart_daemon_on_section_change/2,
++%                fun should_not_restart_daemon_on_changing_ignored_section_key/2,
++%                fun should_restart_daemon_on_section_key_change/2
++%            ]]
++%        }
++%    }.
 +
 +
 +should_check_daemon(DName, _) ->

+        fun should_init_empty_aggregate/2,
+        fun should_get_empty_aggregate/2,
+        fun should_change_stats_on_values_add/2,
+        fun should_change_stats_for_all_times_on_values_add/2,
+        fun should_change_stats_on_values_change/2,
+        fun should_change_stats_for_all_times_on_values_change/2,
+        fun should_not_remove_data_after_some_time_for_0_sample/2,
+        fun should_remove_data_after_some_time_for_other_samples/2
+    ],
+    {
+        "CouchDB stats aggregator tests",

+                should_track_process_count(),
+                should_increment_counter_multiple_times_per_pid(),
+                should_decrement_counter_on_process_exit(),
+                % should_decrement_for_each_track_process_count_call_on_exit(),
+                should_return_all_counters_and_absolute_values(),
+                should_return_incremental_counters(),
+                should_return_absolute_values()
