typo
add test
rename and move