More test coverage.
(cherry picked from commit d58469a2c7e360a7c389b76d0183dfe88b11ab10)