Improving logging.
Improving test coverage.