can you also please update the test "in first segment, less than 10 chars left" ? Since we'll have the counter starting at 20 characters I think we need to update that test too.

Otherwise this looks fine