Rename and add test cases