fix test, add more tests