Added rename and tests