Code cleanup, updated tests of logger.log()