update comments and tests