WIP: improve TAP reporter