Add more tests.

Change-Id: Ia4f92e09481de33a276ac4f8a3572b94a88d0aae