fix TP of TP;
fix unit tests