Refactor Test Cases