Unit test fixes for loggin