Testcase by Feature refactoring