remove stranded return statement
add more tests