Test Cases : code- refactor