Fix the tests (Need mock logger)
Merge branch 'add_more_logs'