(*) Refactored the tests for PTS

(?) Transitional commit
(*) Removed unneeded tests for PTS

(?) Transitional commit
(*) Renamed new tests for PTS and TS

(?) Transitional commit
(*) Refactored new tests for PTS and TS

(?) Final commit in the test series