Tests, log cleanup