Added a few tests, and comments.