Fix tests, loggers, ...