fixed a rename error and added missing test cases for it