fix some tests
add tests