Added tests.
Removed cluttering comments.