Refactor the test loggers to behave more sensibly