rename and fix test