rename and fixt tests