Test improvements.

Change-Id: I8a7f691ce40915fa5bac360ae3440f104c906d87