Add log
More and more test fixing