tp.h: test refactored.