update comments and tests.