Improve unit tests and comments.