rename and tidy test cases