did refactoring of test cases