Fixed some test and comments.

added tests.