Rename and refactor feature tests