refactoring of testcases and classes