[SE,RP]{refactoring} I07 - refactored testcases + bugfix notes