rename
add test & cleanup