fix test + more test