- Refactor, add new test case