Updated unit tests and comments.