(*) Refactored new tests for PTS and TS