group tests into subtests.
document and small tweaks