Yet more test coverage + more logger cleanups