Logger updates to fix tests