rename some vars
add some more tests