diff --git a/.gitignore b/.gitignore
index c562f97a7..37bb79e76 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@ test-byte-readers
 test-peek-file-reader
 test-parse-trie
 test-lrec
+test-maps-and-sets
 test-join-bucket-keeper
 termcvt
 a.out
diff --git a/c/Makefile b/c/Makefile
index 65ba57416..d7c3b1747 100644
--- a/c/Makefile
+++ b/c/Makefile
@@ -57,6 +57,16 @@ input/lrec_reader_mmap_nidx.c input/lrec_reader_stdio_nidx.c \
 input/lrec_reader_mmap_xtab.c input/lrec_reader_stdio_xtab.c \
 containers/test_lrec.c
 
+TEST_MAPS_AND_SETS_SRCS = lib/mlrutil.c lib/mlr_globals.c lib/string_builder.c \
+containers/lrec.c containers/header_keeper.c containers/sllv.c \
+containers/slls.c containers/lhmslv.c \
+input/file_reader_mmap.c      input/file_reader_stdio.c \
+input/lrec_reader_mmap_csvlite.c  input/lrec_reader_stdio_csvlite.c \
+input/lrec_reader_mmap_dkvp.c input/lrec_reader_stdio_dkvp.c \
+input/lrec_reader_mmap_nidx.c input/lrec_reader_stdio_nidx.c \
+input/lrec_reader_mmap_xtab.c input/lrec_reader_stdio_xtab.c \
+containers/test_maps_and_sets.c
+
 TEST_JOIN_BUCKET_KEEPER_SRCS = \
 lib/mlrutil.c lib/mlr_globals.c lib/string_builder.c \
 mapping/context.c \
@@ -145,12 +155,13 @@ mlrp: .always dsls
 
 tests: unit-test reg-test
 
-unit-test: test-mlrutil test-byte-readers test-peek-file-reader test-parse-trie test-lrec test-string-builder test-join-bucket-keeper
+unit-test: test-mlrutil test-byte-readers test-peek-file-reader test-parse-trie test-lrec test-maps-and-sets test-string-builder test-join-bucket-keeper
 	./test-mlrutil
 	./test-byte-readers
 	./test-peek-file-reader
 	./test-parse-trie
 	./test-lrec
+	./test-maps-and-sets
 	./test-string-builder
 	./test-join-bucket-keeper
 	@echo
@@ -166,13 +177,14 @@ dev-tests: dev-unit-test reg-test
 
 # Unfortunately --error-exitcode=1 doesn't work well since there are
 # valgrind-detected errors in stdlibs. :(
-dev-unit-test: test-mlrutil test-byte-readers test-peek-file-reader test-parse-trie test-lrec test-string-builder test-join-bucket-keeper
+dev-unit-test: test-mlrutil test-byte-readers test-peek-file-reader test-parse-trie test-lrec test-maps-and-sets test-string-builder test-join-bucket-keeper
 	#valgrind --leak-check=full --error-exitcode=1 ./a.out
 	valgrind --leak-check=full ./test-mlrutil
 	valgrind --leak-check=full ./test-byte-readers
 	valgrind --leak-check=full ./test-Peek-file-reader
 	valgrind --leak-check=full ./test-parse-trie
 	valgrind --leak-check=full ./test-lrec
+	valgrind --leak-check=full ./test-maps-and-sets
 	valgrind --leak-check=full ./test-string-builder
 	valgrind --leak-check=full ./test-join-bucket-keeper
 	@echo
@@ -195,6 +207,9 @@ test-peek-file-reader: .always
 test-lrec: .always
 	$(CCDEBUG) -D__TEST_LREC_MAIN__ $(TEST_LREC_SRCS) -o test-lrec
 
+test-maps-and-sets: .always
+	$(CCDEBUG) -D__TEST_MAPS_AND_SETS_MAIN__ $(TEST_MAPS_AND_SETS_SRCS) -o test-maps-and-sets
+
 test-mlrutil: .always
 	$(CCDEBUG) -D__TEST_MLRUTIL_MAIN__ lib/mlrutil.c lib/test_mlrutil.c -o test-mlrutil
 
@@ -211,42 +226,6 @@ test-join-bucket-keeper: .always
 # Standalone mains
 # TODO: replace the interesting content with unit tests; jettison the rest
 
-dheap:
-	$(CCDEBUG) -D__DHEAP_MAIN__ containers/dheap.c lib/mlrutil.c
-
-slls:
-	$(CCDEBUG) -D__SLLS_MAIN__ containers/slls.c lib/mlrutil.c
-
-sllv:
-	$(CCDEBUG) -D__SLLV_MAIN__ containers/sllv.c lib/mlrutil.c
-
-hmss:
-	$(CCDEBUG) -D__HMSS_MAIN__ containers/hmss.c  lib/mlrutil.c
-
-lhms2v:
-	$(CCDEBUG) -D__LHMS2V_MAIN__ containers/lhms2v.c  lib/mlrutil.c
-
-lhmslv:
-	$(CCDEBUG) -D__LHMSLV_MAIN__ containers/lhmslv.c  lib/mlrutil.c containers/slls.c
-
-lhmss:
-	$(CCDEBUG) -D__LHMSS_MAIN__ containers/lhmss.c  lib/mlrutil.c
-
-lhmsi:
-	$(CCDEBUG) -D__LHMSI_MAIN__ containers/lhmsi.c  lib/mlrutil.c
-
-lhmsv:
-	$(CCDEBUG) -D__LHMSV_MAIN__ containers/lhmsv.c  lib/mlrutil.c
-
-lrec:
-	$(CCDEBUG) -D__LREC_MAIN__ containers/lrec.c  lib/mlrutil.c
-
-top_keeper:
-	$(CCDEBUG) -D__TOP_KEEPER_MAIN__ containers/top_keeper.c lib/mlrutil.c
-
-pk:
-	$(CCDEBUG) -D__PERCENTILE_KEEPER_MAIN__ containers/percentile_keeper.c lib/mlrutil.c
-
 ap:
 	$(CCDEBUG) -D__AP_MAIN__ cli/argparse.c containers/sllv.c containers/slls.c lib/mlrutil.c
 
diff --git a/c/containers/dheap.c b/c/containers/dheap.c
index 0bef2bf36..ea46bdff0 100644
--- a/c/containers/dheap.c
+++ b/c/containers/dheap.c
@@ -286,34 +286,3 @@ void dheap_sort(double *array, int n)
 
 	dheap_free(pdheap);
 }
-
-// ================================================================
-#ifdef __DHEAP_MAIN__
-int main(int argc, char **argv) {
-	dheap_t *pdheap = dheap_alloc();
-	dheap_check(pdheap, __FILE__,  __LINE__);
-	dheap_add(pdheap, 4.1);
-	dheap_add(pdheap, 3.1);
-	dheap_add(pdheap, 2.1);
-	dheap_add(pdheap, 6.1);
-	dheap_add(pdheap, 5.1);
-	dheap_add(pdheap, 8.1);
-	dheap_add(pdheap, 7.1);
-	dheap_print(pdheap);
-	dheap_check(pdheap, __FILE__,  __LINE__);
-
-	printf("\n");
-	printf("remove %lf\n", dheap_remove(pdheap));
-	printf("remove %lf\n", dheap_remove(pdheap));
-	printf("remove %lf\n", dheap_remove(pdheap));
-	printf("remove %lf\n", dheap_remove(pdheap));
-	printf("\n");
-
-	dheap_print(pdheap);
-	dheap_check(pdheap, __FILE__,  __LINE__);
-
-	dheap_free(pdheap);
-
-	return 0;
-}
-#endif // __DHEAP_MAIN__
diff --git a/c/containers/hss.c b/c/containers/hss.c
index 9b08b40f4..0d8011422 100644
--- a/c/containers/hss.c
+++ b/c/containers/hss.c
@@ -243,21 +243,3 @@ void hss_dump(hss_t* pset) {
 			get_state_name(pe->state), index, pe->ideal_index, key_string);
 	}
 }
-
-// ----------------------------------------------------------------
-#ifdef __HSS_MAIN__
-int main(int argc, char** argv)
-{
-	hss_t *pset = hss_alloc();
-	hss_add(pset, "x");
-	hss_add(pset, "y");
-	hss_add(pset, "x");
-	hss_add(pset, "z");
-	hss_remove(pset, "y");
-	printf("set size = %d\n", hss_size(pset));
-	hss_dump(pset);
-	hss_check_counts(pset);
-	hss_free(pset);
-	return 0;
-}
-#endif
diff --git a/c/containers/lhms2v.c b/c/containers/lhms2v.c
index 8ee432c7b..7e95efe6d 100644
--- a/c/containers/lhms2v.c
+++ b/c/containers/lhms2v.c
@@ -345,21 +345,3 @@ void lhms2v_dump(lhms2v_t* pmap) {
 			pe->ideal_index, key1_string, key2_string, value_string);
 	}
 }
-
-// ----------------------------------------------------------------
-#ifdef __LHMS2V_MAIN__
-int main(int argc, char** argv)
-{
-	lhms2v_t *pmap = lhms2v_alloc();
-	lhms2v_put(pmap, "a", "x", "3");
-	lhms2v_put(pmap, "a", "y", "5");
-	lhms2v_put(pmap, "a", "x", "4");
-	lhms2v_put(pmap, "b", "z", "7");
-	lhms2v_remove(pmap, "a", "y");
-	printf("map size = %d\n", lhms2v_size(pmap));
-	lhms2v_dump(pmap);
-	lhms2v_check_counts(pmap);
-	lhms2v_free(pmap);
-	return 0;
-}
-#endif
diff --git a/c/containers/lhmsi.c b/c/containers/lhmsi.c
index b094fbb75..7d4353fb6 100644
--- a/c/containers/lhmsi.c
+++ b/c/containers/lhmsi.c
@@ -330,25 +330,3 @@ void lhmsi_dump(lhmsi_t* pmap) {
 			pe->ideal_index, key_string, pe->value);
 	}
 }
-
-// ----------------------------------------------------------------
-#ifdef __LHMSI_MAIN__
-int main(int argc, char** argv)
-{
-	lhmsi_t *pmap = lhmsi_alloc();
-	lhmsi_put(pmap, "x", 3);
-	lhmsi_put(pmap, "y", 5);
-	lhmsi_put(pmap, "x", 4);
-	lhmsi_put(pmap, "z", 7);
-	lhmsi_remove(pmap, "y");
-	printf("map size = %d\n", pmap->num_occupied);
-	lhmsi_dump(pmap);
-	printf("map has(\"w\") = %d\n", lhmsi_has_key(pmap, "w"));
-	printf("map has(\"x\") = %d\n", lhmsi_has_key(pmap, "x"));
-	printf("map has(\"y\") = %d\n", lhmsi_has_key(pmap, "y"));
-	printf("map has(\"z\") = %d\n", lhmsi_has_key(pmap, "z"));
-	lhmsi_check_counts(pmap);
-	lhmsi_free(pmap);
-	return 0;
-}
-#endif
diff --git a/c/containers/lhmslv.c b/c/containers/lhmslv.c
index 8aacdb3ce..3b5c6b539 100644
--- a/c/containers/lhmslv.c
+++ b/c/containers/lhmslv.c
@@ -335,33 +335,3 @@ void lhmslv_dump(lhmslv_t* pmap) {
 			pe->ideal_index, key_string, value_string);
 	}
 }
-
-// ----------------------------------------------------------------
-#ifdef __LHMSLV_MAIN__
-int main(int argc, char** argv)
-{
-	slls_t* ax = slls_alloc();
-	slls_add_no_free(ax, "a");
-	slls_add_no_free(ax, "x");
-
-	slls_t* ay = slls_alloc();
-	slls_add_no_free(ay, "a");
-	slls_add_no_free(ay, "y");
-
-	slls_t* bz = slls_alloc();
-	slls_add_no_free(bz, "b");
-	slls_add_no_free(bz, "z");
-
-	lhmslv_t *pmap = lhmslv_alloc();
-	lhmslv_put(pmap, ax, "3");
-	lhmslv_put(pmap, ay, "5");
-	lhmslv_put(pmap, ax, "4");
-	lhmslv_put(pmap, bz, "7");
-	lhmslv_remove(pmap, ay);
-	printf("map size = %d\n", lhmslv_size(pmap));
-	lhmslv_dump(pmap);
-	lhmslv_check_counts(pmap);
-	lhmslv_free(pmap);
-	return 0;
-}
-#endif
diff --git a/c/containers/lhmss.c b/c/containers/lhmss.c
index ffd9e26d4..301bbde26 100644
--- a/c/containers/lhmss.c
+++ b/c/containers/lhmss.c
@@ -322,21 +322,3 @@ void lhmss_dump(lhmss_t* pmap) {
 			pe->ideal_index, key_string, value_string);
 	}
 }
-
-// ----------------------------------------------------------------
-#ifdef __LHMSS_MAIN__
-int main(int argc, char** argv)
-{
-	lhmss_t *pmap = lhmss_alloc();
-	lhmss_put(pmap, "x", "3");
-	lhmss_put(pmap, "y", "5");
-	lhmss_put(pmap, "x", "4");
-	lhmss_put(pmap, "z", "7");
-	lhmss_remove(pmap, "y");
-	printf("map size = %d\n", pmap->num_occupied);
-	lhmss_dump(pmap);
-	lhmss_check_counts(pmap);
-	lhmss_free(pmap);
-	return 0;
-}
-#endif
diff --git a/c/containers/lhmsv.c b/c/containers/lhmsv.c
index ebb19056d..8a4cf0e55 100644
--- a/c/containers/lhmsv.c
+++ b/c/containers/lhmsv.c
@@ -303,25 +303,3 @@ void lhmsv_dump(lhmsv_t* pmap) {
 			pe->ideal_index, key_string, pe->pvvalue);
 	}
 }
-
-// ----------------------------------------------------------------
-#ifdef __LHMSV_MAIN__
-int main(int argc, char** argv)
-{
-	int x3 = 3;
-	int x5 = 5;
-	int x4 = 4;
-	int x7 = 7;
-	lhmsv_t *pmap = lhmsv_alloc();
-	lhmsv_put(pmap, "x", &x3);
-	lhmsv_put(pmap, "y", &x5);
-	lhmsv_put(pmap, "x", &x4);
-	lhmsv_put(pmap, "z", &x7);
-	lhmsv_remove(pmap, "y");
-	printf("map size = %d\n", pmap->num_occupied);
-	lhmsv_dump(pmap);
-	lhmsv_check_counts(pmap);
-	lhmsv_free(pmap);
-	return 0;
-}
-#endif
diff --git a/c/containers/percentile_keeper.c b/c/containers/percentile_keeper.c
index 193891ef3..a4319a7d4 100644
--- a/c/containers/percentile_keeper.c
+++ b/c/containers/percentile_keeper.c
@@ -65,37 +65,3 @@ double percentile_keeper_emit(percentile_keeper_t* ppercentile_keeper, double pe
 	}
 	return ppercentile_keeper->data[compute_index(ppercentile_keeper->size, percentile)];
 }
-
-// ================================================================
-#ifdef __PERCENTILE_KEEPER_MAIN__
-void percentile_keeper_dump(percentile_keeper_t* ppercentile_keeper) {
-	for (int i = 0; i < ppercentile_keeper->size; i++)
-		printf("[%02d] %.8lf\n", i, ppercentile_keeper->data[i]);
-}
-int main(int argc, char** argv) {
-	char buffer[1024];
-	percentile_keeper_t* ppercentile_keeper = percentile_keeper_alloc();
-	char* line;
-	while ((line = fgets(buffer, sizeof(buffer), stdin)) != NULL) {
-		int len = strlen(line);
-		if (len >= 1) // xxx write and use a chomp()
-			if (line[len-1] == '\n')
-				line[len-1] = 0;
-		double v;
-		if (!mlr_try_double_from_string(line, &v)) {
-			percentile_keeper_ingest(ppercentile_keeper, v);
-		} else {
-			printf("meh? >>%s<<\n", line);
-		}
-	}
-	percentile_keeper_dump(ppercentile_keeper);
-	printf("\n");
-	double p;
-	p = 0.10; printf("%.2lf: %.6lf\n", p, percentile_keeper_emit(ppercentile_keeper, p));
-	p = 0.50; printf("%.2lf: %.6lf\n", p, percentile_keeper_emit(ppercentile_keeper, p));
-	p = 0.90; printf("%.2lf: %.6lf\n", p, percentile_keeper_emit(ppercentile_keeper, p));
-	printf("\n");
-	percentile_keeper_dump(ppercentile_keeper);
-	return 0;
-}
-#endif // __PERCENTILE_KEEPER_MAIN__
diff --git a/c/containers/slls.c b/c/containers/slls.c
index 94d8f6da4..b1935097a 100644
--- a/c/containers/slls.c
+++ b/c/containers/slls.c
@@ -235,19 +235,3 @@ void slls_sort(slls_t* plist) {
 
 	free(node_array);
 }
-
-// ----------------------------------------------------------------
-#ifdef __SLLS_MAIN__
-int main(int argc, char** argv)  {
-	slls_t* plist = slls_from_line(argv[1], ',', FALSE);
-	printf("len=%d\n", plist->length);
-	for (sllse_t* pe = plist->phead; pe != NULL; pe = pe->pnext)
-		printf("val=%s\n", (char*)pe->value);
-	slls_sort(plist);
-	printf("\n");
-	printf("len=%d\n", plist->length);
-	for (sllse_t* pe = plist->phead; pe != NULL; pe = pe->pnext)
-		printf("val=%s\n", (char*)pe->value);
-	return 0;
-}
-#endif
diff --git a/c/containers/sllv.c b/c/containers/sllv.c
index da06d91d9..27553ce48 100644
--- a/c/containers/sllv.c
+++ b/c/containers/sllv.c
@@ -115,32 +115,3 @@ sllv_t* sllv_append(sllv_t* pa, sllv_t* pb) {
 	pa->ptail = pb->ptail;
 	return pa;
 }
-
-// ================================================================
-#ifdef __SLLV_MAIN__
-static void print_list(sllv_t* pa, char* desc) {
-	printf("%s [%d]:\n", desc, pa->length);
-	for (sllve_t* pe = pa->phead; pe != NULL; pe = pe->pnext) {
-		printf("  %s\n", (char*)pe->pvdata);
-	}
-}
-
-int main(int argc, char** argv) {
-	sllv_t* pa = sllv_alloc();
-	sllv_add(pa, "a");
-	sllv_add(pa, "b");
-	sllv_add(pa, "c");
-
-	sllv_t* pb = sllv_alloc();
-	sllv_add(pb, "d");
-	sllv_add(pb, "e");
-
-	print_list(pa, "A");
-	print_list(pb, "B");
-
-	pa = sllv_append(pa, pb);
-	print_list(pa, "A+B");
-
-	return 0;
-}
-#endif // __SLLV_MAIN__
diff --git a/c/containers/test_maps_and_sets.c b/c/containers/test_maps_and_sets.c
new file mode 100644
index 000000000..39ed1ed31
--- /dev/null
+++ b/c/containers/test_maps_and_sets.c
@@ -0,0 +1,288 @@
+#include <stdio.h>
+#include <string.h>
+#include "lib/minunit.h"
+#include "lib/mlrutil.h"
+#include "containers/lrec.h"
+#include "containers/sllv.h"
+#include "input/lrec_readers.h"
+
+#ifdef __TEST_MAPS_AND_SETS_MAIN__
+int tests_run         = 0;
+int tests_failed      = 0;
+int assertions_run    = 0;
+int assertions_failed = 0;
+
+// ----------------------------------------------------------------
+static char* test_nil() {
+	mu_assert_lf(0 == 0);
+
+	return NULL;
+}
+
+// ================================================================
+static char * run_all_tests() {
+	mu_run_test(test_nil);
+	return 0;
+}
+
+int main(int argc, char **argv) {
+	char *result = run_all_tests();
+	printf("\n");
+	if (result != 0) {
+		printf("Not all unit tests passed\n");
+	}
+	else {
+		printf("TEST_MAPS_AND_SETS: ALL UNIT TESTS PASSED\n");
+	}
+	printf("Tests      passed: %d of %d\n", tests_run - tests_failed, tests_run);
+	printf("Assertions passed: %d of %d\n", assertions_run - assertions_failed, assertions_run);
+
+	return result != 0;
+}
+#endif // __TEST_MAPS_AND_SETS_MAIN__
+
+
+//int main(int argc, char **argv) {
+//	dheap_t *pdheap = dheap_alloc();
+//	dheap_check(pdheap, __FILE__,  __LINE__);
+//	dheap_add(pdheap, 4.1);
+//	dheap_add(pdheap, 3.1);
+//	dheap_add(pdheap, 2.1);
+//	dheap_add(pdheap, 6.1);
+//	dheap_add(pdheap, 5.1);
+//	dheap_add(pdheap, 8.1);
+//	dheap_add(pdheap, 7.1);
+//	dheap_print(pdheap);
+//	dheap_check(pdheap, __FILE__,  __LINE__);
+//
+//	printf("\n");
+//	printf("remove %lf\n", dheap_remove(pdheap));
+//	printf("remove %lf\n", dheap_remove(pdheap));
+//	printf("remove %lf\n", dheap_remove(pdheap));
+//	printf("remove %lf\n", dheap_remove(pdheap));
+//	printf("\n");
+//
+//	dheap_print(pdheap);
+//	dheap_check(pdheap, __FILE__,  __LINE__);
+//
+//	dheap_free(pdheap);
+//
+//	return 0;
+//}
+
+//int main(int argc, char** argv)
+//{
+//	hss_t *pset = hss_alloc();
+//	hss_add(pset, "x");
+//	hss_add(pset, "y");
+//	hss_add(pset, "x");
+//	hss_add(pset, "z");
+//	hss_remove(pset, "y");
+//	printf("set size = %d\n", hss_size(pset));
+//	hss_dump(pset);
+//	hss_check_counts(pset);
+//	hss_free(pset);
+//	return 0;
+//}
+
+//int main(int argc, char** argv)
+//{
+//	lhms2v_t *pmap = lhms2v_alloc();
+//	lhms2v_put(pmap, "a", "x", "3");
+//	lhms2v_put(pmap, "a", "y", "5");
+//	lhms2v_put(pmap, "a", "x", "4");
+//	lhms2v_put(pmap, "b", "z", "7");
+//	lhms2v_remove(pmap, "a", "y");
+//	printf("map size = %d\n", lhms2v_size(pmap));
+//	lhms2v_dump(pmap);
+//	lhms2v_check_counts(pmap);
+//	lhms2v_free(pmap);
+//	return 0;
+//}
+
+//int main(int argc, char** argv)
+//{
+//	lhmsi_t *pmap = lhmsi_alloc();
+//	lhmsi_put(pmap, "x", 3);
+//	lhmsi_put(pmap, "y", 5);
+//	lhmsi_put(pmap, "x", 4);
+//	lhmsi_put(pmap, "z", 7);
+//	lhmsi_remove(pmap, "y");
+//	printf("map size = %d\n", pmap->num_occupied);
+//	lhmsi_dump(pmap);
+//	printf("map has(\"w\") = %d\n", lhmsi_has_key(pmap, "w"));
+//	printf("map has(\"x\") = %d\n", lhmsi_has_key(pmap, "x"));
+//	printf("map has(\"y\") = %d\n", lhmsi_has_key(pmap, "y"));
+//	printf("map has(\"z\") = %d\n", lhmsi_has_key(pmap, "z"));
+//	lhmsi_check_counts(pmap);
+//	lhmsi_free(pmap);
+//	return 0;
+//}
+
+//int main(int argc, char** argv)
+//{
+//	slls_t* ax = slls_alloc();
+//	slls_add_no_free(ax, "a");
+//	slls_add_no_free(ax, "x");
+//
+//	slls_t* ay = slls_alloc();
+//	slls_add_no_free(ay, "a");
+//	slls_add_no_free(ay, "y");
+//
+//	slls_t* bz = slls_alloc();
+//	slls_add_no_free(bz, "b");
+//	slls_add_no_free(bz, "z");
+//
+//	lhmslv_t *pmap = lhmslv_alloc();
+//	lhmslv_put(pmap, ax, "3");
+//	lhmslv_put(pmap, ay, "5");
+//	lhmslv_put(pmap, ax, "4");
+//	lhmslv_put(pmap, bz, "7");
+//	lhmslv_remove(pmap, ay);
+//	printf("map size = %d\n", lhmslv_size(pmap));
+//	lhmslv_dump(pmap);
+//	lhmslv_check_counts(pmap);
+//	lhmslv_free(pmap);
+//	return 0;
+//}
+
+//int main(int argc, char** argv)
+//{
+//	lhmss_t *pmap = lhmss_alloc();
+//	lhmss_put(pmap, "x", "3");
+//	lhmss_put(pmap, "y", "5");
+//	lhmss_put(pmap, "x", "4");
+//	lhmss_put(pmap, "z", "7");
+//	lhmss_remove(pmap, "y");
+//	printf("map size = %d\n", pmap->num_occupied);
+//	lhmss_dump(pmap);
+//	lhmss_check_counts(pmap);
+//	lhmss_free(pmap);
+//	return 0;
+//}
+
+//int main(int argc, char** argv)
+//{
+//	int x3 = 3;
+//	int x5 = 5;
+//	int x4 = 4;
+//	int x7 = 7;
+//	lhmsv_t *pmap = lhmsv_alloc();
+//	lhmsv_put(pmap, "x", &x3);
+//	lhmsv_put(pmap, "y", &x5);
+//	lhmsv_put(pmap, "x", &x4);
+//	lhmsv_put(pmap, "z", &x7);
+//	lhmsv_remove(pmap, "y");
+//	printf("map size = %d\n", pmap->num_occupied);
+//	lhmsv_dump(pmap);
+//	lhmsv_check_counts(pmap);
+//	lhmsv_free(pmap);
+//	return 0;
+//}
+
+//void percentile_keeper_dump(percentile_keeper_t* ppercentile_keeper) {
+//	for (int i = 0; i < ppercentile_keeper->size; i++)
+//		printf("[%02d] %.8lf\n", i, ppercentile_keeper->data[i]);
+//}
+
+//int main(int argc, char** argv) {
+//	char buffer[1024];
+//	percentile_keeper_t* ppercentile_keeper = percentile_keeper_alloc();
+//	char* line;
+//	while ((line = fgets(buffer, sizeof(buffer), stdin)) != NULL) {
+//		int len = strlen(line);
+//		if (len >= 1) // xxx write and use a chomp()
+//			if (line[len-1] == '\n')
+//				line[len-1] = 0;
+//		double v;
+//		if (!mlr_try_double_from_string(line, &v)) {
+//			percentile_keeper_ingest(ppercentile_keeper, v);
+//		} else {
+//			printf("meh? >>%s<<\n", line);
+//		}
+//	}
+//	percentile_keeper_dump(ppercentile_keeper);
+//	printf("\n");
+//	double p;
+//	p = 0.10; printf("%.2lf: %.6lf\n", p, percentile_keeper_emit(ppercentile_keeper, p));
+//	p = 0.50; printf("%.2lf: %.6lf\n", p, percentile_keeper_emit(ppercentile_keeper, p));
+//	p = 0.90; printf("%.2lf: %.6lf\n", p, percentile_keeper_emit(ppercentile_keeper, p));
+//	printf("\n");
+//	percentile_keeper_dump(ppercentile_keeper);
+//	return 0;
+//}
+
+//int main(int argc, char** argv)  {
+//	slls_t* plist = slls_from_line(argv[1], ',', FALSE);
+//	printf("len=%d\n", plist->length);
+//	for (sllse_t* pe = plist->phead; pe != NULL; pe = pe->pnext)
+//		printf("val=%s\n", (char*)pe->value);
+//	slls_sort(plist);
+//	printf("\n");
+//	printf("len=%d\n", plist->length);
+//	for (sllse_t* pe = plist->phead; pe != NULL; pe = pe->pnext)
+//		printf("val=%s\n", (char*)pe->value);
+//	return 0;
+//}
+
+//static void print_list(sllv_t* pa, char* desc) {
+//	printf("%s [%d]:\n", desc, pa->length);
+//	for (sllve_t* pe = pa->phead; pe != NULL; pe = pe->pnext) {
+//		printf("  %s\n", (char*)pe->pvdata);
+//	}
+//}
+
+//int main(int argc, char** argv) {
+//	sllv_t* pa = sllv_alloc();
+//	sllv_add(pa, "a");
+//	sllv_add(pa, "b");
+//	sllv_add(pa, "c");
+//
+//	sllv_t* pb = sllv_alloc();
+//	sllv_add(pb, "d");
+//	sllv_add(pb, "e");
+//
+//	print_list(pa, "A");
+//	print_list(pb, "B");
+//
+//	pa = sllv_append(pa, pb);
+//	print_list(pa, "A+B");
+//
+//	return 0;
+//}
+
+//void top_keeper_dump(top_keeper_t* ptop_keeper) {
+//	for (int i = 0; i < ptop_keeper->size; i++)
+//		printf("[%02d] %.8lf\n", i, ptop_keeper->top_values[i]);
+//	for (int i = ptop_keeper->size; i < ptop_keeper->capacity; i++)
+//		printf("[%02d] ---\n", i);
+//}
+
+//int main(int argc, char** argv) {
+//	int capacity = 5;
+//	char buffer[1024];
+//	if (argc == 2)
+//		(void)sscanf(argv[1], "%d", &capacity);
+//	top_keeper_t* ptop_keeper = top_keeper_alloc(capacity);
+//	char* line;
+//	while ((line = fgets(buffer, sizeof(buffer), stdin)) != NULL) {
+//		int len = strlen(line);
+//		if (len >= 1) // xxx write and use a chomp()
+//			if (line[len-1] == '\n')
+//				line[len-1] = 0;
+//		if (streq(line, "")) {
+//			//top_keeper_dump(ptop_keeper);
+//			printf("\n");
+//		} else {
+//			double v;
+//			if (!mlr_try_double_from_string(line, &v)) {
+//				top_keeper_add(ptop_keeper, v, NULL);
+//				top_keeper_dump(ptop_keeper);
+//				printf("\n");
+//			} else {
+//				printf("meh? >>%s<<\n", line);
+//			}
+//		}
+//	}
+//	return 0;
+//}
diff --git a/c/containers/top_keeper.c b/c/containers/top_keeper.c
index 49716004b..3eda084cf 100644
--- a/c/containers/top_keeper.c
+++ b/c/containers/top_keeper.c
@@ -76,41 +76,3 @@ void top_keeper_add(top_keeper_t* ptop_keeper, double value, lrec_t* prec) {
 		ptop_keeper->top_precords[destidx] = prec; // xxx copy?? xxx free on shift-off?!?
 	}
 }
-
-// ================================================================
-#ifdef __TOP_KEEPER_MAIN__
-void top_keeper_dump(top_keeper_t* ptop_keeper) {
-	for (int i = 0; i < ptop_keeper->size; i++)
-		printf("[%02d] %.8lf\n", i, ptop_keeper->top_values[i]);
-	for (int i = ptop_keeper->size; i < ptop_keeper->capacity; i++)
-		printf("[%02d] ---\n", i);
-}
-int main(int argc, char** argv) {
-	int capacity = 5;
-	char buffer[1024];
-	if (argc == 2)
-		(void)sscanf(argv[1], "%d", &capacity);
-	top_keeper_t* ptop_keeper = top_keeper_alloc(capacity);
-	char* line;
-	while ((line = fgets(buffer, sizeof(buffer), stdin)) != NULL) {
-		int len = strlen(line);
-		if (len >= 1) // xxx write and use a chomp()
-			if (line[len-1] == '\n')
-				line[len-1] = 0;
-		if (streq(line, "")) {
-			//top_keeper_dump(ptop_keeper);
-			printf("\n");
-		} else {
-			double v;
-			if (!mlr_try_double_from_string(line, &v)) {
-				top_keeper_add(ptop_keeper, v, NULL);
-				top_keeper_dump(ptop_keeper);
-				printf("\n");
-			} else {
-				printf("meh? >>%s<<\n", line);
-			}
-		}
-	}
-	return 0;
-}
-#endif // __TOP_KEEPER_MAIN__