Refactor test cases
Rename test cases