make behaviour of fn clearer
be explicit about what the mappings are
continue to fashion testlist builder into pipeline
reorg text