Improved tests and comments.