[SE,RP]{refactoring} I07,I08 - refactored testcases