Updated tests and updated comments.