Tests for FK of TP improved