Removing this case looks wrong. It does not seem to be covered by your new tests