Added new test cases
Rename