add some tests
fix test