[2.21] fix Tests (PG*, TK*)