Updated few comments and tests.