[SE,RP]{refactoring} I02,I03 - Refactored TestCases