Refactoring of tests for better structure, renamed tests to testP1, testP2 etc. as explained in the problem description