Refactoring of test cases