Add more unit tests

Cover some more scenarios.

Bug: 32300769
Change-Id: I4b804ebd5e475c86ff66d83beaa6eef619762730
5 files changed