rename and added tests