add test
add improved get