Modified test cases
Refactoring