test-mode: properly deal with aggregations
test-mode: respect stops
test-mode: make output a bit more descriptive