rename and refactor tests