Updated comments.
Updated tests.