fix bad merge
add more tests